[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: inet_ntop fix for mingw32

From: Simon Josefsson
Subject: Re: inet_ntop fix for mingw32
Date: Wed, 18 Jan 2006 09:54:46 +0100
User-agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux)

This fixes the socklen M4 test.  It more or less duplicate the
sys_socket module but I don't see any other way around it.

Ok to install?

Index: socklen.m4
RCS file: /sources/gnulib/gnulib/m4/socklen.m4,v
retrieving revision 1.3
diff -u -p -u -w -r1.3 socklen.m4
--- socklen.m4  2 Dec 2005 18:23:00 -0000       1.3
+++ socklen.m4  18 Jan 2006 08:55:03 -0000
@@ -1,17 +1,18 @@
-# socklen.m4 serial 2
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# socklen.m4 serial 3
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
-dnl From Albert Chin.
+dnl From Albert Chin, Windows fixes from Simon Josefsson.
 dnl Check for socklen_t: historically on BSD it is an int, and in
 dnl POSIX 1g it is a type of its own, but some platforms use different
 dnl types for the argument to getsockopt, getpeername, etc.  So we
 dnl have to test to find something that will work.
-  [AC_CHECK_TYPE([socklen_t], ,
+  [AC_CHECK_HEADERS_ONCE([sys/socket.h ws2tcpip.h])
+   AC_CHECK_TYPE([socklen_t], ,
      [AC_MSG_CHECKING([for socklen_t equivalent])
         [# Systems have either "struct sockaddr *" or
@@ -21,7 +22,12 @@ AC_DEFUN([gl_TYPE_SOCKLEN_T],
           for t in int size_t "unsigned int" "long int" "unsigned long int"; do
               [#include <sys/types.h>
+               #if HAVE_SYS_SOCKET_H
                #include <sys/socket.h>
+                #endif
+               #if HAVE_WS2TCPIP_H
+                # include <ws2tcpip.h>
+                #endif
                int getpeername (int, $arg2 *, $t *);],
                [$t len;
@@ -39,4 +45,9 @@ AC_DEFUN([gl_TYPE_SOCKLEN_T],
       AC_DEFINE_UNQUOTED([socklen_t], [$gl_cv_socklen_t_equiv],
         [type to use in place of socklen_t if not defined])],
      [#include <sys/types.h>
-      #include <sys/socket.h>])])
+      #if HAVE_SYS_SOCKET_H
+      # include <sys/socket.h>
+      #endif
+      #if HAVE_WS2TCPIP_H
+      # include <ws2tcpip.h>
+      #endif])])

reply via email to

[Prev in Thread] Current Thread [Next in Thread]