X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsys_ioctl.in.h;h=8b0e2361a955ee17abc83e773c04070fd9995883;hb=692a15c587c6d741cba6423319efcc957c45c9cb;hp=511d2c5c5f780a706c1ec157910588ec1c58fd3c;hpb=a1b4e274c19df1fcb7540aaa82c65154a85ce880;p=gnulib.git

diff --git a/lib/sys_ioctl.in.h b/lib/sys_ioctl.in.h
index 511d2c5c5..8b0e2361a 100644
--- a/lib/sys_ioctl.in.h
+++ b/lib/sys_ioctl.in.h
@@ -44,18 +44,23 @@
 /* Declare overridden functions.  */
 
 #if @GNULIB_IOCTL@
-# if @SYS_IOCTL_H_HAVE_WINSOCK2_H@
+# if @REPLACE_IOCTL@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef ioctl
 #   define ioctl rpl_ioctl
 #  endif
+_GL_FUNCDECL_RPL (ioctl, int,
+                  (int fd, int request, ... /* {void *,char *} arg */));
+_GL_CXXALIAS_RPL (ioctl, int,
+                  (int fd, int request, ... /* {void *,char *} arg */));
+# else
+#  if @SYS_IOCTL_H_HAVE_WINSOCK2_H@ || 1
 _GL_FUNCDECL_SYS (ioctl, int,
                   (int fd, int request, ... /* {void *,char *} arg */));
+#  endif
+_GL_CXXALIAS_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