[GNUnet-SVN] r28890 - in libmicrohttpd: . src/microhttpd

[gnunet]

Author: grothoff
Date: 2013-08-28 18:41:17 +0200 (Wed, 28 Aug 2013)
New Revision: 28890

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/microhttpd/daemon.c
   libmicrohttpd/src/microhttpd/internal.h
Log:
fix #3007

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2013-08-28 15:11:55 UTC (rev 28889)
+++ libmicrohttpd/ChangeLog     2013-08-28 16:41:17 UTC (rev 28890)
@@ -1,3 +1,6 @@
+Wed Aug 28 18:40:47 CEST 2013
+       Fix #3007 (build issue if messages are disabled). -CG
+
 Tue Aug 27 18:39:08 CEST 2013
        Fix build issue if SOCK_NONBLOCK/EPOLL_CLOEXEC are not
        defined (as is the case on older glibc versions). -CG

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2013-08-28 15:11:55 UTC (rev 
28889)
+++ libmicrohttpd/src/microhttpd/daemon.c       2013-08-28 16:41:17 UTC (rev 
28890)
@@ -625,8 +625,10 @@
        }
     }
 #if DEBUG_CONNECT
+#if HAVE_MESSAGES
   MHD_DLOG (daemon, "Maximum socket in select set: %d\n", *max_fd);
 #endif
+#endif
   return MHD_YES;
 }
 
@@ -1276,9 +1278,12 @@
     if ( (MHD_YES == external_add) &&
         (-1 != daemon->wpipe[1]) &&
         (1 != WRITE (daemon->wpipe[1], "n", 1)) )
-      MHD_DLOG (daemon,
-               "failed to signal new connection via pipe");
-
+      {
+#if HAVE_MESSAGES
+       MHD_DLOG (daemon,
+                 "failed to signal new connection via pipe");
+#endif
+      }
 #if EPOLL_SUPPORT
   if (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY))
     {

Modified: libmicrohttpd/src/microhttpd/internal.h
===================================================================
--- libmicrohttpd/src/microhttpd/internal.h     2013-08-28 15:11:55 UTC (rev 
28889)
+++ libmicrohttpd/src/microhttpd/internal.h     2013-08-28 16:41:17 UTC (rev 
28890)
@@ -185,7 +185,6 @@
 void 
 MHD_DLOG (const struct MHD_Daemon *daemon, 
          const char *format, ...);
-
 #endif
 
 /**