Fix link errors on mingw.

diff --git a/ChangeLog b/ChangeLog
index dca5a125c2136e920549344cbd83f55d00b51606..199c9b869b1e8032b4a3b5b33c60723d2c7d6df7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-28  Bruno Haible  <bruno@clisp.org>
+
+       Fix link errors on mingw.
+       * lib/sys_ioctl.in.h (ioctl): Fix declaration idiom.
+       * modules/sys_ioctl-tests (Makefile.am): Link test-sys_ioctl-c++ with
+       $(LIBSOCKET).
+       * modules/sys_select-tests (Makefile.am): Link test-sys_select-c++ with
+       $(LIBSOCKET).
+
 2010-03-28  Bruno Haible  <bruno@clisp.org>
             Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 

diff --git a/lib/sys_ioctl.in.h b/lib/sys_ioctl.in.h
index eee3b57f17a81a38ab2548bc40650b7f12db2f99..193880a99cd265c56d7bf55345cd91b33c4cdef2 100644 (file)
--- a/lib/sys_ioctl.in.h
+++ b/lib/sys_ioctl.in.h
@@ -49,13 +49,18 @@
 #   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
 _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 */));
+# endif
 _GL_CXXALIASWARN (ioctl);
 #elif @SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
 # undef ioctl

diff --git a/modules/sys_ioctl-tests b/modules/sys_ioctl-tests
index a647d8f743df25f458d01da034aa33533e225d7f..d700d3434d3c4843f6ced044b32ca69993528d79 100644 (file)
--- a/modules/sys_ioctl-tests
+++ b/modules/sys_ioctl-tests
@@ -15,5 +15,5 @@ if ANSICXX
 TESTS += test-sys_ioctl-c++
 check_PROGRAMS += test-sys_ioctl-c++
 test_sys_ioctl_c___SOURCES = test-sys_ioctl-c++.cc
-test_sys_ioctl_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
+test_sys_ioctl_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(LIB_CLOCK_GETTIME)
 endif

diff --git a/modules/sys_select-tests b/modules/sys_select-tests
index 6e7a5be14ba10b1651c6e5e62f45e2efc18b6a14..1ba7a4af3bc7fd8bec736e10d0a6854f00b2f37e 100644 (file)
--- a/modules/sys_select-tests
+++ b/modules/sys_select-tests
@@ -15,5 +15,5 @@ if ANSICXX
 TESTS += test-sys_select-c++
 check_PROGRAMS += test-sys_select-c++
 test_sys_select_c___SOURCES = test-sys_select-c++.cc
-test_sys_select_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
+test_sys_select_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(LIB_NANOSLEEP)
 endif