ioctl: Fix C++ test error on mingw.

diff --git a/ChangeLog b/ChangeLog
index b80dfea29da8bb4bdeecfb4e4545f8f3f0c3f3ef..0bb6e2164dba2370871059299ff535b39657534d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-04  Bruno Haible  <bruno@clisp.org>
+
+       ioctl: Fix C++ test error on mingw.
+       * lib/ioctl.c (ioctl): Renamed from rpl_ioctl.
+       * lib/sys_ioctl.in.h (ioctl): When SYS_IOCTL_H_HAVE_WINSOCK2_H is 1,
+       use _GL_FUNCDECL_SYS, not _GL_FUNCDECL_RPL.
+
 2010-04-03  Bruno Haible  <bruno@clisp.org>
 
        wcwidth: Fix C++ test error on mingw.

diff --git a/lib/ioctl.c b/lib/ioctl.c
index 1d409c6712e9fe063841a6aabc0ee7e4a60a5910..91eb3be1b9c613ab2cbbd1a126e4edb226ab5eeb 100644 (file)
--- a/lib/ioctl.c
+++ b/lib/ioctl.c
@@ -50,7 +50,7 @@ rpl_ioctl (int fd, int request, ... /* {void *,char *} arg */)
 # include "w32sock.h"
 
 int
-rpl_ioctl (int fd, int req, ...)
+ioctl (int fd, int req, ...)
 {
   void *buf;
   va_list args;

diff --git a/lib/sys_ioctl.in.h b/lib/sys_ioctl.in.h
index 6066ecf72d91ed3f27f28e958ca232e955cd849c..8b0e2361a955ee17abc83e773c04070fd9995883 100644 (file)
--- a/lib/sys_ioctl.in.h
+++ b/lib/sys_ioctl.in.h
@@ -44,7 +44,7 @@
 /* Declare overridden functions.  */
 
 #if @GNULIB_IOCTL@
-# if @SYS_IOCTL_H_HAVE_WINSOCK2_H@ || @REPLACE_IOCTL@
+# if @REPLACE_IOCTL@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef ioctl
 #   define ioctl rpl_ioctl
@@ -54,8 +54,10 @@ _GL_FUNCDECL_RPL (ioctl, int,
 _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