diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-03-08 01:29:57 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2010-03-08 03:11:13 +0100 |
| commit | a1b4e274c19df1fcb7540aaa82c65154a85ce880 (patch) | |
| tree | 1665a93164e5ad26d99ea3f7207080ba1135a610 /lib/sys_ioctl.in.h | |
| parent | e377b2bd0fa750be14180f07d4c23f843fce9cc0 (diff) | |
| download | gnulib-a1b4e274c19df1fcb7540aaa82c65154a85ce880.tar.gz | |
sys_ioctl: Avoid #define replacements in C++ mode.
Diffstat (limited to 'lib/sys_ioctl.in.h')
| -rw-r--r-- | lib/sys_ioctl.in.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/sys_ioctl.in.h b/lib/sys_ioctl.in.h index 05f28da6cd..511d2c5c5f 100644 --- a/lib/sys_ioctl.in.h +++ b/lib/sys_ioctl.in.h @@ -36,22 +36,27 @@ # include <unistd.h> #endif +/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + /* The definition of _GL_WARN_ON_USE is copied here. */ /* Declare overridden functions. */ -#ifdef __cplusplus -extern "C" { -#endif - - #if @GNULIB_IOCTL@ # if @SYS_IOCTL_H_HAVE_WINSOCK2_H@ -# undef ioctl -# define ioctl rpl_ioctl -extern int ioctl (int fd, int request, ... /* {void *,char *} arg */); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef ioctl +# define ioctl rpl_ioctl +# endif +_GL_FUNCDECL_SYS (ioctl, int, + (int fd, int request, ... /* {void *,char *} arg */)); # endif +/* Need to cast, because on glibc systems, the second parameter is + unsigned long int request. */ +_GL_CXXALIAS_SYS_CAST (ioctl, int, + (int fd, int request, ... /* {void *,char *} arg */)); +_GL_CXXALIASWARN (ioctl); #elif @SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ # undef ioctl # define ioctl ioctl_used_without_requesting_gnulib_module_ioctl @@ -64,10 +69,5 @@ _GL_WARN_ON_USE (ioctl, "ioctl does not portably work on sockets - " #endif -#ifdef __cplusplus -} -#endif - - #endif /* _GL_SYS_IOCTL_H */ #endif /* _GL_SYS_IOCTL_H */ |