gmime r1540 - in trunk: . gmime

[fejj svn gnome org]

Author: fejj
Date: Thu Apr  2 03:48:35 2009
New Revision: 1540
URL: http://svn.gnome.org/viewvc/gmime?rev=1540&view=rev

Log:
more configure fixes

Modified:
   trunk/configure.in
   trunk/gmime/gmime-utils.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Apr  2 03:48:35 2009
@@ -87,14 +87,12 @@
 dnl Checks for header files.
 AC_CHECK_HEADERS(sys/mman.h)
 AC_CHECK_HEADERS(sys/param.h)
-AC_CHECK_HEADERS(sys/time.h)
-AC_CHECK_HEADERS(ws2tcpip.h)
+AC_CHECK_HEADERS(winsock2.h)
 AC_CHECK_HEADERS(string.h)
 AC_CHECK_HEADERS(stdlib.h)
 AC_CHECK_HEADERS(unistd.h)
 AC_CHECK_HEADERS(netdb.h)
 AC_CHECK_HEADERS(regex.h)
-AC_CHECK_HEADERS(ctype.h)
 AC_CHECK_HEADERS(time.h)
 AC_CHECK_HEADERS(poll.h)
 

Modified: trunk/gmime/gmime-utils.c
==============================================================================
--- trunk/gmime/gmime-utils.c	(original)
+++ trunk/gmime/gmime-utils.c	Thu Apr  2 03:48:35 2009
@@ -37,16 +37,18 @@
 #include <sys/utsname.h>    /* for uname() */
 #endif
 #include <sys/types.h>
+#ifdef HAVE_PROCESS_H
+#include <process.h>        /* Windows header for getpid() */
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>         /* Unix header for getpid() */
-#else
-#include <process.h>        /* Windows header for getpid() */
 #endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>       /* Windows header for getaddrinfo() */
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #endif
 #ifdef HAVE_NETDB_H
-#include <netdb.h>          /* Unix header for getaddrinfo() */
+#include <netdb.h>
 #endif
 #include <ctype.h>
 #include <errno.h>