[GNUnet-SVN] r24333 - in libmicrohttpd: . src/daemon src/testcurl src/testcurl/https

[gnunet]

Author: grothoff
Date: 2012-10-16 01:34:56 +0200 (Tue, 16 Oct 2012)
New Revision: 24333

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/daemon.c
   libmicrohttpd/src/testcurl/daemontest_digestauth.c
   libmicrohttpd/src/testcurl/daemontest_digestauth_with_arguments.c
   libmicrohttpd/src/testcurl/daemontest_get.c
   libmicrohttpd/src/testcurl/https/tls_test_common.c
   libmicrohttpd/src/testcurl/perf_get.c
   libmicrohttpd/src/testcurl/perf_get_concurrent.c
   libmicrohttpd/src/testcurl/test_start_stop.c
Log:
-fix #if WINDOWS problems reported by Luis Garcia on the mailinglist

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2012-10-15 22:15:43 UTC (rev 24332)
+++ libmicrohttpd/ChangeLog     2012-10-15 23:34:56 UTC (rev 24333)
@@ -1,3 +1,7 @@
+Tue Oct 16 01:33:55 CEST 2012
+       Consistently use "#ifdef" and "#ifndef" WINDOWS, and not
+       sometimes "#if". -CG
+
 Sat Sep  1 20:51:21 CEST 2012
        Releasing libmicrohttpd 0.9.22. -CG
 

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2012-10-15 22:15:43 UTC (rev 24332)
+++ libmicrohttpd/src/daemon/daemon.c   2012-10-15 23:34:56 UTC (rev 24333)
@@ -1147,7 +1147,7 @@
   if (MHD_YES == need_fcntl)
   {
     /* make socket non-inheritable */
-#if WINDOWS
+#ifdef WINDOWS
     DWORD dwFlags;
     if (!GetHandleInformation ((HANDLE) s, &dwFlags) ||
         ((dwFlags != dwFlags & ~HANDLE_FLAG_INHERIT) &&
@@ -1998,7 +1998,7 @@
   int ctype = SOCK_STREAM | sock_cloexec;
   int fd;
   int flags;
-#if WINDOWS
+#ifdef WINDOWS
   DWORD dwFlags;
 #endif
  
@@ -2015,19 +2015,19 @@
   if (0 != sock_cloexec)
     return fd; /* this is it */  
   /* flag was not set during 'socket' call, let's try setting it manually */
-#if !WINDOWS
+#ifndef WINDOWS
   flags = fcntl (fd, F_GETFD);
   if (flags < 0)
 #else
   if (!GetHandleInformation ((HANDLE) fd, &dwFlags))
 #endif
   {
-#if WINDOWS
+#ifdef WINDOWS
     SetErrnoFromWinError (GetLastError ());
 #endif
     return fd; /* good luck */
   }
-#if !WINDOWS
+#ifndef WINDOWS
   if (flags == (flags | FD_CLOEXEC))
     return fd; /* already set */
   flags |= FD_CLOEXEC;
@@ -2038,7 +2038,7 @@
   if (!SetHandleInformation ((HANDLE) fd, HANDLE_FLAG_INHERIT, 0))
 #endif
   {
-#if WINDOWS
+#ifdef WINDOWS
     SetErrnoFromWinError (GetLastError ());
 #endif
     return fd; /* good luck */

Modified: libmicrohttpd/src/testcurl/daemontest_digestauth.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_digestauth.c  2012-10-15 22:15:43 UTC 
(rev 24332)
+++ libmicrohttpd/src/testcurl/daemontest_digestauth.c  2012-10-15 23:34:56 UTC 
(rev 24333)
@@ -137,7 +137,7 @@
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-#if !WINDOWS
+#ifndef WINDOWS
   fd = open("/dev/urandom", O_RDONLY);
   if (-1 == fd)
     {

Modified: libmicrohttpd/src/testcurl/daemontest_digestauth_with_arguments.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_digestauth_with_arguments.c   
2012-10-15 22:15:43 UTC (rev 24332)
+++ libmicrohttpd/src/testcurl/daemontest_digestauth_with_arguments.c   
2012-10-15 23:34:56 UTC (rev 24333)
@@ -137,7 +137,7 @@
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-#if !WINDOWS
+#ifndef WINDOWS
   fd = open("/dev/urandom", O_RDONLY);
   if (-1 == fd)
     {

Modified: libmicrohttpd/src/testcurl/daemontest_get.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_get.c 2012-10-15 22:15:43 UTC (rev 
24332)
+++ libmicrohttpd/src/testcurl/daemontest_get.c 2012-10-15 23:34:56 UTC (rev 
24333)
@@ -499,7 +499,7 @@
   errorCount += testUnknownPortGet (0);
   errorCount += testStopRace (0);
   errorCount += testExternalGet ();
-#if !WINDOWS
+#ifndef WINDOWS
   errorCount += testInternalGet (MHD_USE_POLL);
   errorCount += testMultithreadedGet (MHD_USE_POLL);
   errorCount += testMultithreadedPoolGet (MHD_USE_POLL);

Modified: libmicrohttpd/src/testcurl/https/tls_test_common.c
===================================================================
--- libmicrohttpd/src/testcurl/https/tls_test_common.c  2012-10-15 22:15:43 UTC 
(rev 24332)
+++ libmicrohttpd/src/testcurl/https/tls_test_common.c  2012-10-15 23:34:56 UTC 
(rev 24333)
@@ -276,7 +276,7 @@
                strerror (errno));
       ret = -1;
     }
-#if WINDOWS
+#ifdef WINDOWS
   {
     int i;
     for (i = 0; i < doc_path_len; i++)

Modified: libmicrohttpd/src/testcurl/perf_get.c
===================================================================
--- libmicrohttpd/src/testcurl/perf_get.c       2012-10-15 22:15:43 UTC (rev 
24332)
+++ libmicrohttpd/src/testcurl/perf_get.c       2012-10-15 23:34:56 UTC (rev 
24333)
@@ -493,7 +493,7 @@
   errorCount += testMultithreadedGet (port++, 0);
   errorCount += testMultithreadedPoolGet (port++, 0);
   errorCount += testExternalGet (port++);
-#if !WINDOWS
+#ifndef WINDOWS
   errorCount += testInternalGet (port++, MHD_USE_POLL);
   errorCount += testMultithreadedGet (port++, MHD_USE_POLL);
   errorCount += testMultithreadedPoolGet (port++, MHD_USE_POLL);

Modified: libmicrohttpd/src/testcurl/perf_get_concurrent.c
===================================================================
--- libmicrohttpd/src/testcurl/perf_get_concurrent.c    2012-10-15 22:15:43 UTC 
(rev 24332)
+++ libmicrohttpd/src/testcurl/perf_get_concurrent.c    2012-10-15 23:34:56 UTC 
(rev 24333)
@@ -331,7 +331,7 @@
   errorCount += testMultithreadedGet (port++, 0);
   errorCount += testMultithreadedPoolGet (port++, 0);
   errorCount += testExternalGet (port++);
-#if !WINDOWS
+#ifndef WINDOWS
   errorCount += testInternalGet (port++, MHD_USE_POLL);
   errorCount += testMultithreadedGet (port++, MHD_USE_POLL);
   errorCount += testMultithreadedPoolGet (port++, MHD_USE_POLL);

Modified: libmicrohttpd/src/testcurl/test_start_stop.c
===================================================================
--- libmicrohttpd/src/testcurl/test_start_stop.c        2012-10-15 22:15:43 UTC 
(rev 24332)
+++ libmicrohttpd/src/testcurl/test_start_stop.c        2012-10-15 23:34:56 UTC 
(rev 24333)
@@ -105,7 +105,7 @@
   errorCount += testMultithreadedGet (0);
   errorCount += testMultithreadedPoolGet (0);
   errorCount += testExternalGet ();
-#if !WINDOWS
+#ifndef WINDOWS
   errorCount += testInternalGet (MHD_USE_POLL);
   errorCount += testMultithreadedGet (MHD_USE_POLL);
   errorCount += testMultithreadedPoolGet (MHD_USE_POLL);