diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-03-08 01:33:25 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2010-03-08 03:11:13 +0100 |
| commit | a1133754bf7a631401ad32244041088fb639b819 (patch) | |
| tree | 5b7f1a782ba57c95032dcb2c2379da28a15f0f92 /lib/sys_select.in.h | |
| parent | a1b4e274c19df1fcb7540aaa82c65154a85ce880 (diff) | |
| download | gnulib-a1133754bf7a631401ad32244041088fb639b819.tar.gz | |
sys_select: Avoid #define replacements in C++ mode.
Diffstat (limited to 'lib/sys_select.in.h')
| -rw-r--r-- | lib/sys_select.in.h | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index b506e9fca7..ae2a3d23b9 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -64,40 +64,42 @@ #define _GL_SYS_SELECT_H #if !@HAVE_SYS_SELECT_H@ || @REPLACE_SELECT@ - /* A platform that lacks <sys/select.h>. */ - # include <sys/socket.h> +#endif + +/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ /* The definition of _GL_WARN_ON_USE is copied here. */ -# ifdef __cplusplus -extern "C" { -# endif -# if @GNULIB_SELECT@ -# if @HAVE_WINSOCK2_H@ || @REPLACE_SELECT@ +#if @GNULIB_SELECT@ +# if @HAVE_WINSOCK2_H@ || @REPLACE_SELECT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef select # define select rpl_select -extern int rpl_select (int, fd_set *, fd_set *, fd_set *, struct timeval *); # endif -# elif @HAVE_WINSOCK2_H@ -# undef select -# define select select_used_without_requesting_gnulib_module_select -# elif defined GNULIB_POSIXCHECK -# undef select -# if HAVE_RAW_DECL_SELECT +_GL_FUNCDECL_RPL (select, int, + (int, fd_set *, fd_set *, fd_set *, struct timeval *)); +_GL_CXXALIAS_RPL (select, int, + (int, fd_set *, fd_set *, fd_set *, struct timeval *)); +# else +_GL_CXXALIAS_SYS (select, int, + (int, fd_set *, fd_set *, fd_set *, struct timeval *)); +# endif +_GL_CXXALIASWARN (select); +#elif @HAVE_WINSOCK2_H@ +# undef select +# define select select_used_without_requesting_gnulib_module_select +#elif defined GNULIB_POSIXCHECK +# undef select +# if HAVE_RAW_DECL_SELECT _GL_WARN_ON_USE (select, "select is not always POSIX compliant - " "use gnulib module select for portability"); -# endif -# endif - -# ifdef __cplusplus -} # endif - #endif + #endif /* _GL_SYS_SELECT_H */ #endif /* _GL_SYS_SELECT_H */ #endif /* OSF/1 */ |