Mercurial > hg > octave-lojdl > gnulib-hg

changeset 13077:527b353781be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix link errors on mingw.
author Bruno Haible <bruno@clisp.org>
date Sun, 28 Mar 2010 14:21:28 +0200
parents 90e90e0b8a97
children 00334715e427
files ChangeLog lib/sys_ioctl.in.h modules/sys_ioctl-tests modules/sys_select-tests
diffstat 4 files changed, 17 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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>
 
--- 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
--- a/modules/sys_ioctl-tests
+++ b/modules/sys_ioctl-tests
@@ -15,5 +15,5 @@
 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
--- a/modules/sys_select-tests
+++ b/modules/sys_select-tests
@@ -15,5 +15,5 @@
 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