This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit da08857fc3285602c03de16bc770e46eeaee8a8f Author: Marco Casaroli <[email protected]> AuthorDate: Tue Oct 27 14:04:35 2026 +0100 drivers, fs, libs, net, sched: Remove the unused EXTERN definitions. As in include/, arch/ and boards/: 111 internal headers of drivers/, fs/, graphics/, libs/, net/, sched/ and wireless/ define EXTERN and undefine it at their end, but do not declare data with it. Remove the unused definitions; the extern "C" block for C++ stays. nxstyle reports old errors in cyw_reg_def.h and drivers/wireless/ nrf24l01.h; they are not changed here. Assisted-by: Claude Code:claude-opus-5-5 Signed-off-by: Marco Casaroli <[email protected]> --- drivers/input/ads7843e.h | 4 ---- drivers/input/ft5x06.h | 4 ---- drivers/input/max11802.h | 4 ---- drivers/input/mpr121.h | 4 ---- drivers/input/mxt.h | 4 ---- drivers/input/tsc2007.h | 4 ---- drivers/lcd/sd1329.h | 5 ----- drivers/misc/optee.h | 5 ----- drivers/misc/optee_rpc.h | 5 ----- drivers/misc/optee_supplicant.h | 5 ----- drivers/mmcsd/mmcsd_csd.h | 5 ----- drivers/mmcsd/mmcsd_extcsd.h | 5 ----- drivers/mmcsd/mmcsd_sdio.h | 5 ----- drivers/mmcsd/mmcsd_spi.h | 5 ----- drivers/net/enc28j60.h | 4 ---- drivers/net/ksz9477_reg.h | 4 ---- drivers/net/oa_tc6/oa_tc6.h | 4 ---- drivers/pipes/pipe_common.h | 4 ---- drivers/rpmsg/rpmsg_port.h | 4 ---- drivers/segger/config/SEGGER_SYSVIEW_Conf.h | 5 ----- drivers/serial/pty.h | 4 ---- drivers/usbhost/usbhost_composite.h | 5 ----- drivers/vhost/vhost-blk.h | 4 ---- drivers/vhost/vhost-can.h | 4 ---- drivers/vhost/vhost-i2c.h | 4 ---- drivers/vhost/vhost-rng.h | 4 ---- drivers/vhost/vhost-rpmb.h | 4 ---- drivers/vhost/vhost-rpmsg.h | 4 ---- drivers/video/mipidsi/mipi_dsi.h | 4 ---- drivers/virtio/virtio-blk.h | 4 ---- drivers/virtio/virtio-gpu.h | 4 ---- drivers/virtio/virtio-input.h | 4 ---- drivers/virtio/virtio-net.h | 4 ---- drivers/virtio/virtio-pci.h | 4 ---- drivers/virtio/virtio-rng.h | 4 ---- drivers/virtio/virtio-rpmb.h | 4 ---- drivers/virtio/virtio-rpmsg.h | 4 ---- drivers/virtio/virtio-serial.h | 4 ---- drivers/virtio/virtio-snd.h | 4 ---- drivers/wireless/ieee80211/bcm43xxx/cyw_reg_def.h | 5 ----- drivers/wireless/lpwan/sx127x/sx127x.h | 5 ----- drivers/wireless/nrf24l01.h | 5 ----- fs/driver/driver.h | 5 ----- fs/event/event.h | 4 ---- fs/romfs/fs_romfs.h | 5 ----- fs/semaphore/semaphore.h | 4 ---- graphics/nxbe/nxbe.h | 5 ----- graphics/nxglib/nxglib.h | 5 ----- graphics/nxglib/nxglib_bitblit.h | 5 ----- graphics/nxmu/nxmu.h | 5 ----- libs/libc/aio/aio.h | 5 ----- libs/libc/environ/environ.h | 4 ---- libs/libc/libc.h | 5 ----- libs/libc/obstack/lib_obstack_malloc.h | 5 ----- libs/libc/unistd/unistd.h | 5 ----- libs/libm/libm/libm.h | 5 ----- libs/libnx/nxcontext.h | 5 ----- libs/libnx/nxfonts/nxfonts_pixel-lcd-machine.h | 5 ----- libs/libnx/nxfonts/nxfonts_pixel-unicode.h | 5 ----- libs/libnx/nxfonts/nxfonts_sans17x22.h | 5 ----- libs/libnx/nxfonts/nxfonts_sans17x23b.h | 5 ----- libs/libnx/nxfonts/nxfonts_sans20x26.h | 5 ----- libs/libnx/nxfonts/nxfonts_sans20x27b.h | 5 ----- libs/libnx/nxfonts/nxfonts_sans22x29.h | 5 ----- libs/libnx/nxfonts/nxfonts_sans22x29b.h | 5 ----- libs/libnx/nxfonts/nxfonts_sans23x27.h | 5 ----- libs/libnx/nxfonts/nxfonts_sans28x37.h | 5 ----- libs/libnx/nxfonts/nxfonts_sans28x37b.h | 5 ----- libs/libnx/nxfonts/nxfonts_sans39x48.h | 5 ----- libs/libnx/nxfonts/nxfonts_sans40x49b.h | 5 ----- libs/libnx/nxfonts/nxfonts_serif22x28b.h | 5 ----- libs/libnx/nxfonts/nxfonts_serif22x29.h | 5 ----- libs/libnx/nxfonts/nxfonts_serif27x38b.h | 5 ----- libs/libnx/nxfonts/nxfonts_serif29x37.h | 5 ----- libs/libnx/nxfonts/nxfonts_serif38x48.h | 5 ----- libs/libnx/nxfonts/nxfonts_serif38x49b.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-10x20.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-4x6.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x7.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x8.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x10.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x12.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x9.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18.h | 5 ----- libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h | 5 ----- net/devif/devif.h | 5 ----- net/ipfrag/ipfrag.h | 3 --- net/mld/mld.h | 4 ---- net/procfs/procfs.h | 4 ---- net/route/route.h | 4 ---- net/socket/socket.h | 5 ----- net/udp/udp.h | 4 ---- net/utils/utils.h | 4 ---- sched/irq/irq.h | 4 ---- sched/pthread/pthread.h | 4 ---- sched/semaphore/semaphore.h | 4 ---- sched/wdog/wdog.h | 4 ---- wireless/ieee802154/mac802154.h | 4 ---- 111 files changed, 511 deletions(-) diff --git a/drivers/input/ads7843e.h b/drivers/input/ads7843e.h index 92c5009b419..6cb0fe9b7d9 100644 --- a/drivers/input/ads7843e.h +++ b/drivers/input/ads7843e.h @@ -159,14 +159,10 @@ struct ads7843e_dev_s ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/input/ft5x06.h b/drivers/input/ft5x06.h index 27157234bc6..d6dadccea94 100644 --- a/drivers/input/ft5x06.h +++ b/drivers/input/ft5x06.h @@ -163,14 +163,10 @@ struct ft5x06_touch_data_s ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/input/max11802.h b/drivers/input/max11802.h index a6bc5e427d3..4fe8614f4b3 100644 --- a/drivers/input/max11802.h +++ b/drivers/input/max11802.h @@ -145,14 +145,10 @@ struct max11802_dev_s ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/input/mpr121.h b/drivers/input/mpr121.h index 9af7c6b3ce6..626e525272e 100644 --- a/drivers/input/mpr121.h +++ b/drivers/input/mpr121.h @@ -198,14 +198,10 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/input/mxt.h b/drivers/input/mxt.h index d35ce914e3b..594f2491e56 100644 --- a/drivers/input/mxt.h +++ b/drivers/input/mxt.h @@ -268,18 +268,14 @@ struct mxt_msg_s ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Function Prototypes ****************************************************************************/ -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/input/tsc2007.h b/drivers/input/tsc2007.h index fac1f8ab106..3a9a4d904f3 100644 --- a/drivers/input/tsc2007.h +++ b/drivers/input/tsc2007.h @@ -99,14 +99,10 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/lcd/sd1329.h b/drivers/lcd/sd1329.h index c5b5f9002df..e82ad77df51 100644 --- a/drivers/lcd/sd1329.h +++ b/drivers/lcd/sd1329.h @@ -508,16 +508,11 @@ * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/drivers/misc/optee.h b/drivers/misc/optee.h index 637c1afc3b4..31776dd0c97 100644 --- a/drivers/misc/optee.h +++ b/drivers/misc/optee.h @@ -91,13 +91,9 @@ struct optee_shm * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif #ifdef CONFIG_ARCH_ADDRENV @@ -127,7 +123,6 @@ int optee_to_msg_param(FAR struct optee_priv_data *priv, int optee_convert_to_errno(uint32_t oterr); uint32_t optee_convert_from_errno(int err); -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/drivers/misc/optee_rpc.h b/drivers/misc/optee_rpc.h index 0907fd1b768..447dc1b0067 100644 --- a/drivers/misc/optee_rpc.h +++ b/drivers/misc/optee_rpc.h @@ -33,20 +33,15 @@ * Public Functions Prototypes ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif void optee_rpc_handle_cmd(FAR struct optee_priv_data *priv, FAR struct optee_shm *shm, FAR void **last_page_list); -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/drivers/misc/optee_supplicant.h b/drivers/misc/optee_supplicant.h index 65dc3d4c60d..0e97e86e1db 100644 --- a/drivers/misc/optee_supplicant.h +++ b/drivers/misc/optee_supplicant.h @@ -35,13 +35,9 @@ * Public Functions Prototypes ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif void optee_supplicant_init(FAR struct idr_s **shm_idr); @@ -62,7 +58,6 @@ int optee_supplicant_send(uint32_t ret, uint32_t num_params, int optee_supplicant_recv(FAR uint32_t *func, FAR uint32_t *num_params, FAR struct tee_ioctl_param *params); -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/drivers/mmcsd/mmcsd_csd.h b/drivers/mmcsd/mmcsd_csd.h index 274a3cf8d3f..6769a650044 100644 --- a/drivers/mmcsd/mmcsd_csd.h +++ b/drivers/mmcsd/mmcsd_csd.h @@ -400,16 +400,11 @@ * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/drivers/mmcsd/mmcsd_extcsd.h b/drivers/mmcsd/mmcsd_extcsd.h index 37e61d2a6fe..344092b741e 100644 --- a/drivers/mmcsd/mmcsd_extcsd.h +++ b/drivers/mmcsd/mmcsd_extcsd.h @@ -62,16 +62,11 @@ * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/drivers/mmcsd/mmcsd_sdio.h b/drivers/mmcsd/mmcsd_sdio.h index 76dcf15c6c4..9d128e56bac 100644 --- a/drivers/mmcsd/mmcsd_sdio.h +++ b/drivers/mmcsd/mmcsd_sdio.h @@ -385,20 +385,15 @@ struct mmcsd_scr_s * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/drivers/mmcsd/mmcsd_spi.h b/drivers/mmcsd/mmcsd_spi.h index f3fc9b93160..6c65a28c2f3 100644 --- a/drivers/mmcsd/mmcsd_spi.h +++ b/drivers/mmcsd/mmcsd_spi.h @@ -161,16 +161,11 @@ * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/drivers/net/enc28j60.h b/drivers/net/enc28j60.h index 0a9fbc5784e..ab80f92f5ef 100644 --- a/drivers/net/enc28j60.h +++ b/drivers/net/enc28j60.h @@ -455,18 +455,14 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Function Prototypes ****************************************************************************/ -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/net/ksz9477_reg.h b/drivers/net/ksz9477_reg.h index 142a1e4590b..c4c56947d9e 100644 --- a/drivers/net/ksz9477_reg.h +++ b/drivers/net/ksz9477_reg.h @@ -174,11 +174,8 @@ begin_packed_struct struct ksz9477_transfer_s ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -194,7 +191,6 @@ int ksz9477_write(struct ksz9477_transfer_s *write_msg); #if defined(__cplusplus) } #endif -#undef EXTERN #endif /* __ASSEMBLY__ */ #endif /* __DRIVERS_NET_KSZ9477_REG_H */ diff --git a/drivers/net/oa_tc6/oa_tc6.h b/drivers/net/oa_tc6/oa_tc6.h index 1d2becc8d8e..397c2f4c697 100644 --- a/drivers/net/oa_tc6/oa_tc6.h +++ b/drivers/net/oa_tc6/oa_tc6.h @@ -362,11 +362,8 @@ struct oa_tc6_driver_s }; #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -505,7 +502,6 @@ int oa_tc6_common_init(FAR struct oa_tc6_driver_s *priv, int oa_tc6_register(FAR struct oa_tc6_driver_s *oa_tc6_dev); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/pipes/pipe_common.h b/drivers/pipes/pipe_common.h index d519a6f02e6..fdf0c26698a 100644 --- a/drivers/pipes/pipe_common.h +++ b/drivers/pipes/pipe_common.h @@ -144,11 +144,8 @@ struct pipe_dev_s ****************************************************************************/ #ifdef __cplusplus -# define EXTERN extern "C" extern "C" { -#else -# define EXTERN extern #endif struct file; /* Forward reference */ @@ -167,7 +164,6 @@ int pipecommon_poll(FAR struct file *filep, FAR struct pollfd_s *fds, int pipecommon_unlink(FAR struct inode *priv); #endif -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/rpmsg/rpmsg_port.h b/drivers/rpmsg/rpmsg_port.h index 43d793ff668..ed14b78f1ab 100644 --- a/drivers/rpmsg/rpmsg_port.h +++ b/drivers/rpmsg/rpmsg_port.h @@ -149,11 +149,8 @@ struct rpmsg_port_s #ifndef __ASSEMBLY__ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -377,7 +374,6 @@ int rpmsg_port_register(FAR struct rpmsg_port_s *port, void rpmsg_port_unregister(FAR struct rpmsg_port_s *port); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/segger/config/SEGGER_SYSVIEW_Conf.h b/drivers/segger/config/SEGGER_SYSVIEW_Conf.h index 171338f7438..f0187063348 100644 --- a/drivers/segger/config/SEGGER_SYSVIEW_Conf.h +++ b/drivers/segger/config/SEGGER_SYSVIEW_Conf.h @@ -75,13 +75,9 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -98,7 +94,6 @@ extern "C" unsigned int note_sysview_get_interrupt_id(void); -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/drivers/serial/pty.h b/drivers/serial/pty.h index 94a24e953f4..21c53cacca0 100644 --- a/drivers/serial/pty.h +++ b/drivers/serial/pty.h @@ -35,11 +35,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -79,7 +76,6 @@ void ptmx_minor_free(uint8_t minor); int pty_register2(int minor, bool susv1); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/usbhost/usbhost_composite.h b/drivers/usbhost/usbhost_composite.h index 5e77dd3ac79..fcd3ce87bb4 100644 --- a/drivers/usbhost/usbhost_composite.h +++ b/drivers/usbhost/usbhost_composite.h @@ -38,13 +38,9 @@ * Public Function Prototypes ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -80,7 +76,6 @@ int usbhost_composite(FAR struct usbhost_hubport_s *hport, FAR struct usbhost_id_s *id, FAR struct usbhost_class_s **usbclass); -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/drivers/vhost/vhost-blk.h b/drivers/vhost/vhost-blk.h index e1e097960da..7e3aeaab5f2 100644 --- a/drivers/vhost/vhost-blk.h +++ b/drivers/vhost/vhost-blk.h @@ -38,11 +38,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -51,7 +48,6 @@ extern "C" int vhost_register_blk_driver(void); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/vhost/vhost-can.h b/drivers/vhost/vhost-can.h index 4e3b9784ccb..5ef0e345f52 100644 --- a/drivers/vhost/vhost-can.h +++ b/drivers/vhost/vhost-can.h @@ -36,11 +36,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -49,7 +46,6 @@ extern "C" int vhost_register_can_driver(void); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/vhost/vhost-i2c.h b/drivers/vhost/vhost-i2c.h index 9366c770405..80def90147d 100644 --- a/drivers/vhost/vhost-i2c.h +++ b/drivers/vhost/vhost-i2c.h @@ -32,11 +32,8 @@ #ifdef CONFIG_DRIVERS_VHOST_I2C #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -57,7 +54,6 @@ extern "C" int vhost_register_i2c_driver(void); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/vhost/vhost-rng.h b/drivers/vhost/vhost-rng.h index 35490a7cb20..e9813716252 100644 --- a/drivers/vhost/vhost-rng.h +++ b/drivers/vhost/vhost-rng.h @@ -40,11 +40,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -53,7 +50,6 @@ extern "C" int vhost_register_rng_driver(void); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/vhost/vhost-rpmb.h b/drivers/vhost/vhost-rpmb.h index 8b99487e217..8f7b73041ac 100644 --- a/drivers/vhost/vhost-rpmb.h +++ b/drivers/vhost/vhost-rpmb.h @@ -40,11 +40,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -53,7 +50,6 @@ extern "C" int vhost_register_rpmb_driver(void); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/vhost/vhost-rpmsg.h b/drivers/vhost/vhost-rpmsg.h index d0a79331827..1ef34836c53 100644 --- a/drivers/vhost/vhost-rpmsg.h +++ b/drivers/vhost/vhost-rpmsg.h @@ -38,11 +38,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -51,7 +48,6 @@ extern "C" int vhost_register_rpmsg_driver(void); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/video/mipidsi/mipi_dsi.h b/drivers/video/mipidsi/mipi_dsi.h index 028885d6b21..444417aa85f 100644 --- a/drivers/video/mipidsi/mipi_dsi.h +++ b/drivers/video/mipidsi/mipi_dsi.h @@ -38,11 +38,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -85,7 +82,6 @@ int mipi_dsi_host_driver_register(FAR struct mipi_dsi_host *host); int mipi_dsi_device_driver_register(FAR struct mipi_dsi_device *device); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/virtio/virtio-blk.h b/drivers/virtio/virtio-blk.h index dc0d75f3f29..d6b3deca8e7 100644 --- a/drivers/virtio/virtio-blk.h +++ b/drivers/virtio/virtio-blk.h @@ -40,11 +40,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -53,7 +50,6 @@ extern "C" int virtio_register_blk_driver(void); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/virtio/virtio-gpu.h b/drivers/virtio/virtio-gpu.h index dc80f02d3f8..312c0c8369d 100644 --- a/drivers/virtio/virtio-gpu.h +++ b/drivers/virtio/virtio-gpu.h @@ -519,11 +519,8 @@ begin_packed_struct struct virtio_gpu_resource_unmap_blob ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -534,7 +531,6 @@ int virtio_register_gpu_driver(void); int virtio_gpu_fb_register(int display); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/virtio/virtio-input.h b/drivers/virtio/virtio-input.h index 749444414de..ffe20aca38e 100644 --- a/drivers/virtio/virtio-input.h +++ b/drivers/virtio/virtio-input.h @@ -91,11 +91,8 @@ begin_packed_struct struct virtio_input_event } end_packed_struct; #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -104,7 +101,6 @@ extern "C" int virtio_register_input_driver(void); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/virtio/virtio-net.h b/drivers/virtio/virtio-net.h index 2491b7f451c..18281c79000 100644 --- a/drivers/virtio/virtio-net.h +++ b/drivers/virtio/virtio-net.h @@ -40,11 +40,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -53,7 +50,6 @@ extern "C" int virtio_register_net_driver(void); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/virtio/virtio-pci.h b/drivers/virtio/virtio-pci.h index 17588f2bd03..938dbeeaaa3 100644 --- a/drivers/virtio/virtio-pci.h +++ b/drivers/virtio/virtio-pci.h @@ -49,11 +49,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -122,7 +119,6 @@ void virtio_pci_delete_virtqueues(FAR struct virtio_device *vdev); int virtio_pci_modern_probe(FAR struct pci_device_s *dev); int virtio_pci_legacy_probe(FAR struct pci_device_s *dev); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/virtio/virtio-rng.h b/drivers/virtio/virtio-rng.h index 549730c2331..60eb10e8ada 100644 --- a/drivers/virtio/virtio-rng.h +++ b/drivers/virtio/virtio-rng.h @@ -40,11 +40,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -53,7 +50,6 @@ extern "C" int virtio_register_rng_driver(void); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/virtio/virtio-rpmb.h b/drivers/virtio/virtio-rpmb.h index 070db2b035d..fc27b1c4fe2 100644 --- a/drivers/virtio/virtio-rpmb.h +++ b/drivers/virtio/virtio-rpmb.h @@ -40,11 +40,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -53,7 +50,6 @@ extern "C" int virtio_register_rpmb_driver(void); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/virtio/virtio-rpmsg.h b/drivers/virtio/virtio-rpmsg.h index ce374d55e19..3fc7c62d1f9 100644 --- a/drivers/virtio/virtio-rpmsg.h +++ b/drivers/virtio/virtio-rpmsg.h @@ -38,11 +38,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -51,7 +48,6 @@ extern "C" int virtio_register_rpmsg_driver(void); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/virtio/virtio-serial.h b/drivers/virtio/virtio-serial.h index faaf63284d8..c198e3822b6 100644 --- a/drivers/virtio/virtio-serial.h +++ b/drivers/virtio/virtio-serial.h @@ -40,11 +40,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -53,7 +50,6 @@ extern "C" int virtio_register_serial_driver(void); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/virtio/virtio-snd.h b/drivers/virtio/virtio-snd.h index fb992ffbcb5..3839e5c6f7b 100644 --- a/drivers/virtio/virtio-snd.h +++ b/drivers/virtio/virtio-snd.h @@ -346,16 +346,12 @@ struct virtio_snd_chmap_info ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif int virtio_register_snd_driver(void); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/drivers/wireless/ieee80211/bcm43xxx/cyw_reg_def.h b/drivers/wireless/ieee80211/bcm43xxx/cyw_reg_def.h index b4b0554c189..1ce0112f331 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/cyw_reg_def.h +++ b/drivers/wireless/ieee80211/bcm43xxx/cyw_reg_def.h @@ -146,20 +146,15 @@ * Public Data Types ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -# define EXTERN extern "C" extern "C" { -#else -# define EXTERN extern #endif /**************************************************************************** * Public Functions Prototypes ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/drivers/wireless/lpwan/sx127x/sx127x.h b/drivers/wireless/lpwan/sx127x/sx127x.h index ecde2a50010..1c9ad5fec6e 100644 --- a/drivers/wireless/lpwan/sx127x/sx127x.h +++ b/drivers/wireless/lpwan/sx127x/sx127x.h @@ -825,20 +825,15 @@ * Public Data Types ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -# define EXTERN extern "C" extern "C" { -#else -# define EXTERN extern #endif /**************************************************************************** * Public Functions Prototypes ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/drivers/wireless/nrf24l01.h b/drivers/wireless/nrf24l01.h index 0a8858be43b..710f97201d8 100644 --- a/drivers/wireless/nrf24l01.h +++ b/drivers/wireless/nrf24l01.h @@ -148,20 +148,15 @@ * Public Data Types ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -# define EXTERN extern "C" extern "C" { -#else -# define EXTERN extern #endif /**************************************************************************** * Public Functions Prototypes ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/fs/driver/driver.h b/fs/driver/driver.h index 7f89ccfca91..2feb7ac34c7 100644 --- a/fs/driver/driver.h +++ b/fs/driver/driver.h @@ -37,13 +37,9 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -157,7 +153,6 @@ int mtd_proxy(FAR const char *mtddev, int mountflags, FAR struct inode **ppinode); #endif -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/fs/event/event.h b/fs/event/event.h index 0434ecc88ac..47987341268 100644 --- a/fs/event/event.h +++ b/fs/event/event.h @@ -40,18 +40,14 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Function Prototypes ****************************************************************************/ -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/fs/romfs/fs_romfs.h b/fs/romfs/fs_romfs.h index 5ab27852445..34c4846adaa 100644 --- a/fs/romfs/fs_romfs.h +++ b/fs/romfs/fs_romfs.h @@ -177,13 +177,9 @@ struct romfs_nodeinfo_s * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -214,7 +210,6 @@ int romfs_datastart(FAR struct romfs_mountpt_s *rm, void romfs_freenode(FAR struct romfs_nodeinfo_s *node); #endif -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/fs/semaphore/semaphore.h b/fs/semaphore/semaphore.h index 06303477e9c..f98eb259a0a 100644 --- a/fs/semaphore/semaphore.h +++ b/fs/semaphore/semaphore.h @@ -40,18 +40,14 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Function Prototypes ****************************************************************************/ -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/graphics/nxbe/nxbe.h b/graphics/nxbe/nxbe.h index 44d51508564..75c6a2ce5cb 100644 --- a/graphics/nxbe/nxbe.h +++ b/graphics/nxbe/nxbe.h @@ -263,13 +263,9 @@ struct nxbe_state_s * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -820,7 +816,6 @@ void nxbe_clipnull(FAR struct nxbe_clipops_s *cops, FAR struct nxbe_plane_s *plane, FAR const struct nxgl_rect_s *rect); -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/graphics/nxglib/nxglib.h b/graphics/nxglib/nxglib.h index f0ddd0eeb71..ec2705b3cf8 100644 --- a/graphics/nxglib/nxglib.h +++ b/graphics/nxglib/nxglib.h @@ -38,13 +38,9 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -# define EXTERN extern "C" extern "C" { -#else -# define EXTERN extern #endif /**************************************************************************** @@ -513,7 +509,6 @@ void nxglib_cursor_backup_32bpp(FAR struct nxbe_state_s *be, int planeno); #endif -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/graphics/nxglib/nxglib_bitblit.h b/graphics/nxglib/nxglib_bitblit.h index c8284c00d5e..04565cdd31f 100644 --- a/graphics/nxglib/nxglib_bitblit.h +++ b/graphics/nxglib/nxglib_bitblit.h @@ -215,20 +215,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/graphics/nxmu/nxmu.h b/graphics/nxmu/nxmu.h index 26414c932ed..e53b122c59b 100644 --- a/graphics/nxmu/nxmu.h +++ b/graphics/nxmu/nxmu.h @@ -72,13 +72,9 @@ struct nxmu_state_s * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -276,7 +272,6 @@ int nxmu_mousein(FAR struct nxmu_state_s *nxmu, void nxmu_kbdin(FAR struct nxmu_state_s *nxmu, uint8_t nch, FAR uint8_t *ch); #endif -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libc/aio/aio.h b/libs/libc/aio/aio.h index 9d8250d475a..9c6bd678d50 100644 --- a/libs/libc/aio/aio.h +++ b/libs/libc/aio/aio.h @@ -43,20 +43,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Function Prototypes ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libc/environ/environ.h b/libs/libc/environ/environ.h index 2618731054e..c51d44c2871 100644 --- a/libs/libc/environ/environ.h +++ b/libs/libc/environ/environ.h @@ -46,11 +46,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -180,7 +177,6 @@ int env_reserve(FAR struct task_info_s *info, size_t more); void env_removevar(FAR struct task_info_s *info, size_t index); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/libs/libc/libc.h b/libs/libc/libc.h index 4e64b7e9067..6a1465a1530 100644 --- a/libs/libc/libc.h +++ b/libs/libc/libc.h @@ -240,13 +240,9 @@ typedef unsigned long long libc_data_t; * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -342,7 +338,6 @@ static inline void lib_cxx_initialize(void) } #endif -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libc/obstack/lib_obstack_malloc.h b/libs/libc/obstack/lib_obstack_malloc.h index fa6665a94b8..c363688007d 100644 --- a/libs/libc/obstack/lib_obstack_malloc.h +++ b/libs/libc/obstack/lib_obstack_malloc.h @@ -30,13 +30,9 @@ #include <nuttx/compiler.h> #include <stddef.h> -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -47,7 +43,6 @@ FAR void *lib_obstack_malloc(size_t size); FAR void *lib_obstack_realloc(FAR void *ptr, size_t size); -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libc/unistd/unistd.h b/libs/libc/unistd/unistd.h index ca2a23eb852..cbb7ecc6b36 100644 --- a/libs/libc/unistd/unistd.h +++ b/libs/libc/unistd/unistd.h @@ -37,13 +37,9 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -102,7 +98,6 @@ int getopt_common(int argc, FAR char * const argv[], FAR int *longindex, enum getopt_mode_e mode); -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libm/libm/libm.h b/libs/libm/libm/libm.h index 7418038e6e9..a0fa7abe851 100644 --- a/libs/libm/libm/libm.h +++ b/libs/libm/libm/libm.h @@ -42,13 +42,9 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -64,7 +60,6 @@ double lib_expi(size_t n); float lib_sqrtapprox(float x); -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxcontext.h b/libs/libnx/nxcontext.h index 0ab17bc4a49..ad4c3842863 100644 --- a/libs/libnx/nxcontext.h +++ b/libs/libnx/nxcontext.h @@ -50,20 +50,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Function Prototypes ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_pixel-lcd-machine.h b/libs/libnx/nxfonts/nxfonts_pixel-lcd-machine.h index 7ad9931329b..4bdf66d5807 100644 --- a/libs/libnx/nxfonts/nxfonts_pixel-lcd-machine.h +++ b/libs/libnx/nxfonts/nxfonts_pixel-lcd-machine.h @@ -676,20 +676,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_pixel-unicode.h b/libs/libnx/nxfonts/nxfonts_pixel-unicode.h index 4f4b95cd5b6..bdf46008bb1 100644 --- a/libs/libnx/nxfonts/nxfonts_pixel-unicode.h +++ b/libs/libnx/nxfonts/nxfonts_pixel-unicode.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_sans17x22.h b/libs/libnx/nxfonts/nxfonts_sans17x22.h index b0e146c18f0..a818c6b4b23 100644 --- a/libs/libnx/nxfonts/nxfonts_sans17x22.h +++ b/libs/libnx/nxfonts/nxfonts_sans17x22.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_sans17x23b.h b/libs/libnx/nxfonts/nxfonts_sans17x23b.h index 98277cb67e4..d245108ad60 100644 --- a/libs/libnx/nxfonts/nxfonts_sans17x23b.h +++ b/libs/libnx/nxfonts/nxfonts_sans17x23b.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_sans20x26.h b/libs/libnx/nxfonts/nxfonts_sans20x26.h index 828a90a7ae4..a83625d2e3a 100644 --- a/libs/libnx/nxfonts/nxfonts_sans20x26.h +++ b/libs/libnx/nxfonts/nxfonts_sans20x26.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_sans20x27b.h b/libs/libnx/nxfonts/nxfonts_sans20x27b.h index 3f98a178fab..067713279c6 100644 --- a/libs/libnx/nxfonts/nxfonts_sans20x27b.h +++ b/libs/libnx/nxfonts/nxfonts_sans20x27b.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_sans22x29.h b/libs/libnx/nxfonts/nxfonts_sans22x29.h index 23739d9e719..ea06fcf83c5 100644 --- a/libs/libnx/nxfonts/nxfonts_sans22x29.h +++ b/libs/libnx/nxfonts/nxfonts_sans22x29.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_sans22x29b.h b/libs/libnx/nxfonts/nxfonts_sans22x29b.h index fe86a0513cf..c0789984765 100644 --- a/libs/libnx/nxfonts/nxfonts_sans22x29b.h +++ b/libs/libnx/nxfonts/nxfonts_sans22x29b.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_sans23x27.h b/libs/libnx/nxfonts/nxfonts_sans23x27.h index fe90e5d4ffa..7dad671b889 100644 --- a/libs/libnx/nxfonts/nxfonts_sans23x27.h +++ b/libs/libnx/nxfonts/nxfonts_sans23x27.h @@ -826,20 +826,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_sans28x37.h b/libs/libnx/nxfonts/nxfonts_sans28x37.h index db46ae1f0e8..8288af6da53 100644 --- a/libs/libnx/nxfonts/nxfonts_sans28x37.h +++ b/libs/libnx/nxfonts/nxfonts_sans28x37.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_sans28x37b.h b/libs/libnx/nxfonts/nxfonts_sans28x37b.h index ccfbac8f1ce..e17cf70d261 100644 --- a/libs/libnx/nxfonts/nxfonts_sans28x37b.h +++ b/libs/libnx/nxfonts/nxfonts_sans28x37b.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_sans39x48.h b/libs/libnx/nxfonts/nxfonts_sans39x48.h index b3e10204d20..e465cbdaedc 100644 --- a/libs/libnx/nxfonts/nxfonts_sans39x48.h +++ b/libs/libnx/nxfonts/nxfonts_sans39x48.h @@ -875,20 +875,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_sans40x49b.h b/libs/libnx/nxfonts/nxfonts_sans40x49b.h index fe3dd78705a..944cda856a7 100644 --- a/libs/libnx/nxfonts/nxfonts_sans40x49b.h +++ b/libs/libnx/nxfonts/nxfonts_sans40x49b.h @@ -884,20 +884,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_serif22x28b.h b/libs/libnx/nxfonts/nxfonts_serif22x28b.h index f68e6fd71da..2e16879ea72 100644 --- a/libs/libnx/nxfonts/nxfonts_serif22x28b.h +++ b/libs/libnx/nxfonts/nxfonts_serif22x28b.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_serif22x29.h b/libs/libnx/nxfonts/nxfonts_serif22x29.h index b91e3db25c6..bb512834e59 100644 --- a/libs/libnx/nxfonts/nxfonts_serif22x29.h +++ b/libs/libnx/nxfonts/nxfonts_serif22x29.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_serif27x38b.h b/libs/libnx/nxfonts/nxfonts_serif27x38b.h index 38679a9b560..04b41d432de 100644 --- a/libs/libnx/nxfonts/nxfonts_serif27x38b.h +++ b/libs/libnx/nxfonts/nxfonts_serif27x38b.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_serif29x37.h b/libs/libnx/nxfonts/nxfonts_serif29x37.h index 82a4146f7e4..e21fbdd8311 100644 --- a/libs/libnx/nxfonts/nxfonts_serif29x37.h +++ b/libs/libnx/nxfonts/nxfonts_serif29x37.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_serif38x48.h b/libs/libnx/nxfonts/nxfonts_serif38x48.h index 7673bff50a5..7dfc1e44927 100644 --- a/libs/libnx/nxfonts/nxfonts_serif38x48.h +++ b/libs/libnx/nxfonts/nxfonts_serif38x48.h @@ -847,20 +847,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_serif38x49b.h b/libs/libnx/nxfonts/nxfonts_serif38x49b.h index 3685e935f08..7077895ed04 100644 --- a/libs/libnx/nxfonts/nxfonts_serif38x49b.h +++ b/libs/libnx/nxfonts/nxfonts_serif38x49b.h @@ -857,20 +857,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-10x20.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-10x20.h index 8a6b70df4fd..c1a807d289a 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-10x20.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-10x20.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-4x6.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-4x6.h index 2bd04a1e723..f9d8996a1e5 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-4x6.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-4x6.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x7.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x7.h index e2faee0ce92..7463a8ca424 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x7.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x7.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x8.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x8.h index 734803cb258..76050859415 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x8.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x8.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x10.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x10.h index 6e1afd087f6..1f6cf72e231 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x10.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x10.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x12.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x12.h index a0793a8af77..aa7ad995ae4 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x12.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x12.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13.h index 74c8c14875a..988237f227b 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h index dc94b864935..d15b01cf5b0 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h index dbfbca4d6a4..82f05562db0 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x9.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x9.h index f1e74bc1c58..472e8616589 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x9.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x9.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13.h index f2af1679515..3f1565f9543 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h index c7f7ec290fb..84a8b683935 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h index d2050ec5a36..a34038f4633 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14.h index b33bd443cdc..6eb24249a5b 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h index 907ed70a21d..2caff93ff7f 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13.h index b16c76f3c8a..9f952f1850d 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h index 2767e0fb578..41244bd9dca 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h index 109f26d2ca3..2b1f4d0ee94 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15.h index ba8f64c409b..fd863534d40 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h index 86d0e3d7241..625dbcc12ba 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18.h index d0ded448180..ff6889029e0 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h index 81cf681ea08..218d33aa9d4 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h @@ -816,20 +816,15 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** * Public Functions Definitions ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/net/devif/devif.h b/net/devif/devif.h index b067a782aab..4151e63e378 100644 --- a/net/devif/devif.h +++ b/net/devif/devif.h @@ -303,13 +303,9 @@ struct devif_callback_s * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -617,7 +613,6 @@ int netdev_input(FAR struct net_driver_s *dev, uint16_t devif_get_mtu(FAR struct net_driver_s *dev); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/net/ipfrag/ipfrag.h b/net/ipfrag/ipfrag.h index f02fc8dc960..27a0b681d56 100644 --- a/net/ipfrag/ipfrag.h +++ b/net/ipfrag/ipfrag.h @@ -142,11 +142,8 @@ struct ip_fragsnode_s ****************************************************************************/ #ifdef __cplusplus -# define EXTERN extern "C" extern "C" { -#else -# define EXTERN extern #endif /* Only one thread can access g_assemblyhead_ipid and g_assemblyhead_time diff --git a/net/mld/mld.h b/net/mld/mld.h index 65f5cebd020..83537df235d 100644 --- a/net/mld/mld.h +++ b/net/mld/mld.h @@ -210,11 +210,8 @@ struct mld_group_s ****************************************************************************/ #ifdef __cplusplus -# define EXTERN extern "C" extern "C" { -#else -# define EXTERN extern #endif /**************************************************************************** @@ -514,7 +511,6 @@ void mld_addmcastmac(FAR struct net_driver_s *dev, void mld_removemcastmac(FAR struct net_driver_s *dev, FAR const net_ipv6addr_t ipaddr); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/net/procfs/procfs.h b/net/procfs/procfs.h index 9400679b7cd..d9a92bd69d7 100644 --- a/net/procfs/procfs.h +++ b/net/procfs/procfs.h @@ -86,11 +86,8 @@ typedef int (*linegen_t)(FAR struct netprocfs_file_s *netfile); ****************************************************************************/ #ifdef __cplusplus -# define EXTERN extern "C" extern "C" { -#else -# define EXTERN extern #endif /**************************************************************************** @@ -257,7 +254,6 @@ ssize_t netprocfs_read_routes(FAR struct netprocfs_file_s *priv, ssize_t netprocfs_read_devstats(FAR struct netprocfs_file_s *priv, FAR char *buffer, size_t buflen); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/net/route/route.h b/net/route/route.h index 29adf7020b1..bd8454fe33b 100644 --- a/net/route/route.h +++ b/net/route/route.h @@ -78,11 +78,8 @@ typedef int (*route_handler_ipv6_t)(FAR struct net_route_ipv6_s *route, ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -317,7 +314,6 @@ void net_ipv6_dumproute(FAR const char *msg, # define net_ipv6_dumproute(m,r) #endif -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/net/socket/socket.h b/net/socket/socket.h index 75362f06609..06660ffed01 100644 --- a/net/socket/socket.h +++ b/net/socket/socket.h @@ -128,13 +128,9 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -183,7 +179,6 @@ net_sockif(sa_family_t family, int type, int protocol); int net_timeo(clock_t start_time, socktimeo_t timeo); #endif -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/net/udp/udp.h b/net/udp/udp.h index 8bcfe1108a1..b2688abdfbc 100644 --- a/net/udp/udp.h +++ b/net/udp/udp.h @@ -188,11 +188,8 @@ struct udp_callback_s ****************************************************************************/ #ifdef __cplusplus -# define EXTERN extern "C" extern "C" { -#else -# define EXTERN extern #endif /**************************************************************************** @@ -978,7 +975,6 @@ void udp_sendbuffer_notify(FAR struct udp_conn_s *conn); uint16_t udpip_hdrsize(FAR struct udp_conn_s *conn); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/net/utils/utils.h b/net/utils/utils.h index 5b34ae2976c..01bc890a08c 100644 --- a/net/utils/utils.h +++ b/net/utils/utils.h @@ -146,11 +146,8 @@ struct net_bufpool_s ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -690,7 +687,6 @@ void cmsg_store_timestamp(FAR struct msghdr *msg, FAR const struct timespec *tstamp, sockopt_t opt); #endif /* CONFIG_NET_TIMESTAMP */ -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/sched/irq/irq.h b/sched/irq/irq.h index 385e2dd28ab..95136136062 100644 --- a/sched/irq/irq.h +++ b/sched/irq/irq.h @@ -101,11 +101,8 @@ extern volatile uint8_t g_cpu_nestcount[CONFIG_SMP_NCPUS]; ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -165,7 +162,6 @@ bool is_irqchain(int ndx, xcpt_t isr); int irqchain_attach(int ndx, xcpt_t isr, FAR void *arg); #endif -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/sched/pthread/pthread.h b/sched/pthread/pthread.h index 551945b939c..14af6764ecb 100644 --- a/sched/pthread/pthread.h +++ b/sched/pthread/pthread.h @@ -47,11 +47,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -78,7 +75,6 @@ void pthread_mutex_inconsistent(FAR struct tcb_s *tcb); int pthread_mutexattr_verifytype(int type); #endif -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/sched/semaphore/semaphore.h b/sched/semaphore/semaphore.h index b4ba224114d..0990c163e21 100644 --- a/sched/semaphore/semaphore.h +++ b/sched/semaphore/semaphore.h @@ -44,11 +44,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /* Common semaphore logic */ @@ -104,7 +101,6 @@ int nxsem_protect_wait(FAR sem_t *sem); void nxsem_protect_post(FAR sem_t *sem); #endif -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/sched/wdog/wdog.h b/sched/wdog/wdog.h index 317df6ba330..b01e1a17ad2 100644 --- a/sched/wdog/wdog.h +++ b/sched/wdog/wdog.h @@ -51,11 +51,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /* The g_wdactivelist data structure is a singly linked list ordered by @@ -221,7 +218,6 @@ static inline_function clock_t wd_get_next_expire(clock_t curr) return next - curr <= 0 ? 0 : next; } -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/wireless/ieee802154/mac802154.h b/wireless/ieee802154/mac802154.h index 1629d83d2f7..2e188e34f91 100644 --- a/wireless/ieee802154/mac802154.h +++ b/wireless/ieee802154/mac802154.h @@ -39,11 +39,8 @@ ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /* Callback operations to notify the next highest layer of various @@ -355,7 +352,6 @@ int mac802154_resp_associate(MACHANDLE mac, int mac802154_resp_orphan(MACHANDLE mac, FAR struct ieee802154_orphan_resp_s *resp); -#undef EXTERN #ifdef __cplusplus } #endif
