libmicrohttpd

commit eb34a0239f3d63fd2c04401bf341aacf38a141e3
parent 0617124c369fe150123ced3e1c521d69ed4bfff2
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed, 28 Aug 2013 16:41:17 +0000

fix #3007

Diffstat:
M
ChangeLog
 | 
3
+++
M
src/microhttpd/daemon.c
 | 
11
++++++++---
M
src/microhttpd/internal.h
 | 
1
-

3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -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
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
@@ -625,8 +625,10 @@ MHD_get_fdset (struct MHD_Daemon *daemon,
 	}
     }
 #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 @@ internal_add_connection (struct MHD_Daemon *daemon,
     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))
     {
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
@@ -185,7 +185,6 @@ struct MHD_NonceNc
 void 
 MHD_DLOG (const struct MHD_Daemon *daemon, 
 	  const char *format, ...);
-
 #endif
 
 /**