This is an automated email from the ASF dual-hosted git repository. acassis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
commit f183bba3dc2d9fbc7ea80b0ae6c51e4d5435cd75 Author: Marco Casaroli <[email protected]> AuthorDate: Wed Oct 28 16:28:16 2026 +0100 apps: Declare the global data with extern instead of EXTERN. 11 headers declare global data with EXTERN. Each of these declarations is inside the extern "C" block of its header, so plain extern gives it C linkage in C++ too. Use extern and remove the EXTERN definitions. Assisted-by: Claude Code:claude-opus-5-5 Signed-off-by: Marco Casaroli <[email protected]> --- examples/fmsynth/music_scale.h | 7 +---- graphics/pdcurs34/include/curspriv.h | 14 ++++----- graphics/pdcurs34/include/term.h | 6 +--- graphics/pdcurs34/nuttx/pdcnuttx.h | 6 +--- include/graphics/curses.h | 28 ++++++++---------- include/netutils/httpd.h | 8 ++---- include/netutils/thttpd.h | 9 ++---- include/netutils/xtables.h | 9 ++---- include/wireless/wapi.h | 20 ++++++------- netutils/ftpc/ftpc_internal.h | 56 +++++++++++++++++------------------- system/zmodem/zm.h | 9 ++---- 11 files changed, 63 insertions(+), 109 deletions(-) diff --git a/examples/fmsynth/music_scale.h b/examples/fmsynth/music_scale.h index 08ad1d5b9..577eb695d 100644 --- a/examples/fmsynth/music_scale.h +++ b/examples/fmsynth/music_scale.h @@ -45,18 +45,13 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif -EXTERN const float musical_scale[]; +extern const float musical_scale[]; -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/graphics/pdcurs34/include/curspriv.h b/graphics/pdcurs34/include/curspriv.h index 949cd0e15..67f6e6c31 100644 --- a/graphics/pdcurs34/include/curspriv.h +++ b/graphics/pdcurs34/include/curspriv.h @@ -82,9 +82,6 @@ #if defined(__cplusplus) extern "C" { -# define EXTERN extern "C" -#else -# define EXTERN extern #endif /**************************************************************************** @@ -92,11 +89,11 @@ extern "C" ****************************************************************************/ #ifndef CONFIG_PDCURSES_MULTITHREAD -EXTERN WINDOW *pdc_lastscr; -EXTERN bool pdc_trace_on; /* Tracing flag */ -EXTERN bool pdc_color_started; -EXTERN unsigned long pdc_key_modifiers; -EXTERN MOUSE_STATUS pdc_mouse_status; +extern WINDOW *pdc_lastscr; +extern bool pdc_trace_on; /* Tracing flag */ +extern bool pdc_color_started; +extern unsigned long pdc_key_modifiers; +extern MOUSE_STATUS pdc_mouse_status; #endif /**************************************************************************** @@ -148,7 +145,6 @@ size_t PDC_mbstowcs(wchar_t *, const char *, size_t); size_t PDC_wcstombs(char *, const wchar_t *, size_t); #endif -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/graphics/pdcurs34/include/term.h b/graphics/pdcurs34/include/term.h index 3a8a64ad3..c645303f8 100644 --- a/graphics/pdcurs34/include/term.h +++ b/graphics/pdcurs34/include/term.h @@ -40,9 +40,6 @@ #if defined(__cplusplus) extern "C" { -# define EXTERN extern "C" -#else -# define EXTERN extern #endif typedef struct @@ -55,7 +52,7 @@ typedef struct ****************************************************************************/ #ifndef CONFIG_PDCURSES_MULTITHREAD -EXTERN TERMINAL *cur_term; +extern TERMINAL *cur_term; #endif /**************************************************************************** @@ -81,7 +78,6 @@ char *tparm(const char *, long, long, long, long, long, long, long, long, long); int tputs(const char *, int, int (*)(int)); -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/graphics/pdcurs34/nuttx/pdcnuttx.h b/graphics/pdcurs34/nuttx/pdcnuttx.h index 6643d8471..b48d59d6d 100644 --- a/graphics/pdcurs34/nuttx/pdcnuttx.h +++ b/graphics/pdcurs34/nuttx/pdcnuttx.h @@ -188,9 +188,6 @@ #if defined(__cplusplus) extern "C" { -# define EXTERN extern "C" -#else -# define EXTERN extern #endif /* Describes one color pair */ @@ -335,7 +332,7 @@ struct pdc_termscreen_s * single framebuffer instance in the same address space. */ -EXTERN struct pdc_fbstate_s g_pdc_fbstate; +extern struct pdc_fbstate_s g_pdc_fbstate; /**************************************************************************** * Public Function Prototypes @@ -376,7 +373,6 @@ int PDC_input_open(FAR struct pdc_fbstate_s *fbstate); void PDC_input_close(FAR struct pdc_fbstate_s *fbstate); #endif -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/include/graphics/curses.h b/include/graphics/curses.h index d66e19ce9..c48bb057e 100644 --- a/include/graphics/curses.h +++ b/include/graphics/curses.h @@ -766,9 +766,6 @@ #if defined(__cplusplus) extern "C" { -# define EXTERN extern "C" -#else -# define EXTERN extern #endif #ifdef CONFIG_PDCURSES_CHTYPE_LONG @@ -1037,24 +1034,24 @@ void *pdc_alloc_term_ctx(void); #else -EXTERN int LINES; /* terminal height */ -EXTERN int COLS; /* terminal width */ -EXTERN WINDOW *stdscr; /* the default screen window */ -EXTERN WINDOW *curscr; /* the current screen image */ -EXTERN SCREEN *SP; /* curses variables */ -EXTERN MOUSE_STATUS Mouse_status; -EXTERN int COLORS; -EXTERN int COLOR_PAIRS; -EXTERN int TABSIZE; -EXTERN char ttytype[]; /* terminal name/description */ +extern int LINES; /* terminal height */ +extern int COLS; /* terminal width */ +extern WINDOW *stdscr; /* the default screen window */ +extern WINDOW *curscr; /* the current screen image */ +extern SCREEN *SP; /* curses variables */ +extern MOUSE_STATUS Mouse_status; +extern int COLORS; +extern int COLOR_PAIRS; +extern int TABSIZE; +extern char ttytype[]; /* terminal name/description */ #ifdef CONFIG_SYSTEM_TERMCURSES -EXTERN bool graphic_screen; +extern bool graphic_screen; #endif #endif -EXTERN chtype acs_map[]; /* alternate character set map */ +extern chtype acs_map[]; /* alternate character set map */ /**************************************************************************** * Public Function Prototypes @@ -1515,7 +1512,6 @@ unsigned long PDC_get_key_modifiers(void); int PDC_return_key_modifiers(bool); int PDC_save_key_modifiers(bool); -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/include/netutils/httpd.h b/include/netutils/httpd.h index e9dc61f75..415f97db3 100644 --- a/include/netutils/httpd.h +++ b/include/netutils/httpd.h @@ -178,15 +178,12 @@ static struct httpd_cgi_call name = {NULL, str, function} ****************************************************************************/ #ifdef __cplusplus -# define EXTERN extern "C" extern "C" { -#else -# define EXTERN extern #endif -EXTERN const struct httpd_fsdata_file g_httpdfs_root[]; -EXTERN const int g_httpd_numfiles; +extern const struct httpd_fsdata_file g_httpdfs_root[]; +extern const int g_httpd_numfiles; /**************************************************************************** * Public Function Prototypes @@ -274,7 +271,6 @@ bool httpd_is_file(FAR const char *filename); ssize_t httpd_dirlist(int outfd, FAR struct httpd_fs_file *file); #endif -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/include/netutils/thttpd.h b/include/netutils/thttpd.h index a0df9e0b7..96dab70ef 100644 --- a/include/netutils/thttpd.h +++ b/include/netutils/thttpd.h @@ -35,13 +35,9 @@ * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif #ifdef CONFIG_THTTPD_NXFLAT @@ -57,8 +53,8 @@ extern "C" * table may be created.) */ -EXTERN FAR const struct symtab_s *g_thttpdsymtab; -EXTERN int g_thttpdnsymbols; +extern FAR const struct symtab_s *g_thttpdsymtab; +extern int g_thttpdnsymbols; #endif /**************************************************************************** @@ -83,7 +79,6 @@ EXTERN int g_thttpdnsymbols; int thttpd_main(int argc, char **argv); -#undef EXTERN #if defined(__cplusplus) } #endif diff --git a/include/netutils/xtables.h b/include/netutils/xtables.h index 12c116b53..b77e25824 100644 --- a/include/netutils/xtables.h +++ b/include/netutils/xtables.h @@ -459,16 +459,13 @@ struct xtables_rule_match ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif -EXTERN FAR struct xtables_match *xtables_matches; -EXTERN FAR struct xtables_target *xtables_targets; -EXTERN FAR struct xtables_globals *xt_params; +extern FAR struct xtables_match *xtables_matches; +extern FAR struct xtables_target *xtables_targets; +extern FAR struct xtables_globals *xt_params; /**************************************************************************** * Public Function Prototypes diff --git a/include/wireless/wapi.h b/include/wireless/wapi.h index 8663b338b..877867a65 100644 --- a/include/wireless/wapi.h +++ b/include/wireless/wapi.h @@ -305,44 +305,41 @@ enum wapi_pta_prio_e ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /* Frequency flag names. */ -EXTERN FAR const char *g_wapi_freq_flags[]; +extern FAR const char *g_wapi_freq_flags[]; /* ESSID flag names. */ -EXTERN FAR const char *g_wapi_essid_flags[]; +extern FAR const char *g_wapi_essid_flags[]; /* Passphrase algorithm flag names. */ -EXTERN FAR const char *g_wapi_alg_flags[]; +extern FAR const char *g_wapi_alg_flags[]; /* Passphrase WPA Version flag names. */ -EXTERN FAR const char *g_wapi_wpa_ver_flags[]; +extern FAR const char *g_wapi_wpa_ver_flags[]; /* Supported operation mode names. */ -EXTERN FAR const char *g_wapi_modes[]; +extern FAR const char *g_wapi_modes[]; /* Bitrate flag names. */ -EXTERN FAR const char *g_wapi_bitrate_flags[]; +extern FAR const char *g_wapi_bitrate_flags[]; /* Transmit power flag names. */ -EXTERN FAR const char *g_wapi_txpower_flags[]; +extern FAR const char *g_wapi_txpower_flags[]; /* PTA priority flag names. */ -EXTERN FAR const char *g_wapi_pta_prio_flags[]; +extern FAR const char *g_wapi_pta_prio_flags[]; /**************************************************************************** * Public Function Prototyppes @@ -1007,7 +1004,6 @@ int wapi_set_power_save(int sock, FAR const char *ifname, bool on); int wapi_get_power_save(int sock, FAR const char *ifname, bool *on); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/netutils/ftpc/ftpc_internal.h b/netutils/ftpc/ftpc_internal.h index 70e9bb7b9..f385fdae5 100644 --- a/netutils/ftpc/ftpc_internal.h +++ b/netutils/ftpc/ftpc_internal.h @@ -185,11 +185,8 @@ struct ftpc_session_s ****************************************************************************/ #ifdef __cplusplus -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /**************************************************************************** @@ -216,61 +213,60 @@ extern "C" /* Low-level string management */ -EXTERN void ftpc_stripcrlf(FAR char *str); -EXTERN void ftpc_stripslash(FAR char *str); -EXTERN FAR char *ftpc_dequote(FAR const char *hostname); +extern void ftpc_stripcrlf(FAR char *str); +extern void ftpc_stripslash(FAR char *str); +extern FAR char *ftpc_dequote(FAR const char *hostname); /* Connection helpers */ -EXTERN int ftpc_reconnect(FAR struct ftpc_session_s *session); -EXTERN int ftpc_relogin(FAR struct ftpc_session_s *session); +extern int ftpc_reconnect(FAR struct ftpc_session_s *session); +extern int ftpc_relogin(FAR struct ftpc_session_s *session); /* FTP helpers */ -EXTERN void ftpc_reset(struct ftpc_session_s *session); -EXTERN int ftpc_cmd(struct ftpc_session_s *session, const char *cmd, ...) +extern void ftpc_reset(struct ftpc_session_s *session); +extern int ftpc_cmd(struct ftpc_session_s *session, const char *cmd, ...) printf_like(2, 3); -EXTERN int fptc_getreply(struct ftpc_session_s *session); -EXTERN FAR const char *ftpc_lpwd(void); -EXTERN int ftpc_xfrmode(struct ftpc_session_s *session, uint8_t xfrmode); -EXTERN FAR char *ftpc_absrpath(FAR struct ftpc_session_s *session, +extern int fptc_getreply(struct ftpc_session_s *session); +extern FAR const char *ftpc_lpwd(void); +extern int ftpc_xfrmode(struct ftpc_session_s *session, uint8_t xfrmode); +extern FAR char *ftpc_absrpath(FAR struct ftpc_session_s *session, FAR const char *relpath); -EXTERN FAR char *ftpc_abslpath(FAR struct ftpc_session_s *session, +extern FAR char *ftpc_abslpath(FAR struct ftpc_session_s *session, FAR const char *relpath); /* Socket helpers */ -EXTERN int ftpc_sockinit(FAR struct ftpc_socket_s *sock, sa_family_t family); -EXTERN void ftpc_sockclose(FAR struct ftpc_socket_s *sock); -EXTERN int ftpc_sockconnect(FAR struct ftpc_socket_s *sock, +extern int ftpc_sockinit(FAR struct ftpc_socket_s *sock, sa_family_t family); +extern void ftpc_sockclose(FAR struct ftpc_socket_s *sock); +extern int ftpc_sockconnect(FAR struct ftpc_socket_s *sock, FAR struct sockaddr *addr); -EXTERN int ftpc_sockgetsockname(FAR struct ftpc_socket_s *sock, +extern int ftpc_sockgetsockname(FAR struct ftpc_socket_s *sock, FAR union ftpc_sockaddr_u *addr); -EXTERN int ftpc_sockaccept(FAR struct ftpc_socket_s *acceptor, +extern int ftpc_sockaccept(FAR struct ftpc_socket_s *acceptor, FAR struct ftpc_socket_s *sock); -EXTERN int ftpc_socklisten(FAR struct ftpc_socket_s *sock); -EXTERN void ftpc_sockcopy(FAR struct ftpc_socket_s *dest, +extern int ftpc_socklisten(FAR struct ftpc_socket_s *sock); +extern void ftpc_sockcopy(FAR struct ftpc_socket_s *dest, FAR const struct ftpc_socket_s *src); /* Socket I/O helpers */ -EXTERN int ftpc_sockprintf(FAR struct ftpc_socket_s *sock, +extern int ftpc_sockprintf(FAR struct ftpc_socket_s *sock, const char *fmt, ...) printf_like(2, 3); -EXTERN void ftpc_timeout(wdparm_t arg); +extern void ftpc_timeout(wdparm_t arg); /* Transfer helpers */ -EXTERN int ftpc_xfrinit(FAR struct ftpc_session_s *session); -EXTERN int ftpc_recvtext(FAR struct ftpc_session_s *session, +extern int ftpc_xfrinit(FAR struct ftpc_session_s *session); +extern int ftpc_recvtext(FAR struct ftpc_session_s *session, FAR FILE *rinstream, FAR FILE *loutstream); -EXTERN int ftpc_waitdata(FAR struct ftpc_session_s *session, +extern int ftpc_waitdata(FAR struct ftpc_session_s *session, FAR FILE *stream, bool rdwait); -EXTERN void ftpc_xfrreset(struct ftpc_session_s *session); -EXTERN int ftpc_xfrabort(FAR struct ftpc_session_s *session, +extern void ftpc_xfrreset(struct ftpc_session_s *session); +extern int ftpc_xfrabort(FAR struct ftpc_session_s *session, FAR FILE *stream); -#undef EXTERN #ifdef __cplusplus } #endif diff --git a/system/zmodem/zm.h b/system/zmodem/zm.h index 8593e1ff7..25d325df3 100644 --- a/system/zmodem/zm.h +++ b/system/zmodem/zm.h @@ -414,18 +414,14 @@ struct zms_state_s * Public Data ****************************************************************************/ -#undef EXTERN #if defined(__cplusplus) -#define EXTERN extern "C" extern "C" { -#else -#define EXTERN extern #endif /* A handy sequence of 4 zeros */ -EXTERN const uint8_t g_zeroes[4]; +extern const uint8_t g_zeroes[4]; /* Paragraph 8.4. Session Abort Sequence * @@ -441,7 +437,7 @@ EXTERN const uint8_t g_zeroes[4]; #define CANISTR_SIZE (8+10) -EXTERN const uint8_t g_canistr[CANISTR_SIZE]; +extern const uint8_t g_canistr[CANISTR_SIZE]; /**************************************************************************** * Public Function Prototypes @@ -810,7 +806,6 @@ int zm_timerrelease(FAR struct zm_state_s *pzm); # define zm_dumpbuffer(m,b,s) #endif -#undef EXTERN #if defined(__cplusplus) } #endif
