aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-09-26 20:28:50 +0000
committerChristian Grothoff <christian@grothoff.org>2011-09-26 20:28:50 +0000
commit89c4f4882727ed5ce8c3a0a13e6926eca195ec69 (patch)
treefd417f6a074981b64e3e3673e1ca7fa54c5e7038
parent80057ce48e29e12c4284e625c4d646e2b2042e94 (diff)
downloadlibmicrohttpd-89c4f4882727ed5ce8c3a0a13e6926eca195ec69.tar.gz
libmicrohttpd-89c4f4882727ed5ce8c3a0a13e6926eca195ec69.zip
w32/plibc patch from LRN
-rw-r--r--src/daemon/daemon.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 1c09bbe6..99bba8a1 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -2001,7 +2001,7 @@ MHD_start_daemon_va (unsigned int options,
2001#ifndef HAVE_LISTEN_SHUTDOWN 2001#ifndef HAVE_LISTEN_SHUTDOWN
2002 retVal->wpipe[0] = -1; 2002 retVal->wpipe[0] = -1;
2003 retVal->wpipe[1] = -1; 2003 retVal->wpipe[1] = -1;
2004 if (0 != pipe (retVal->wpipe)) 2004 if (0 != PIPE (retVal->wpipe))
2005 { 2005 {
2006#if HAVE_MESSAGES 2006#if HAVE_MESSAGES
2007 FPRINTF(stderr, 2007 FPRINTF(stderr,
@@ -2019,8 +2019,8 @@ MHD_start_daemon_va (unsigned int options,
2019 FPRINTF(stderr, 2019 FPRINTF(stderr,
2020 "file descriptor for control pipe exceeds maximum value\n"); 2020 "file descriptor for control pipe exceeds maximum value\n");
2021#endif 2021#endif
2022 close (retVal->wpipe[0]); 2022 CLOSE (retVal->wpipe[0]);
2023 close (retVal->wpipe[1]); 2023 CLOSE (retVal->wpipe[1]);
2024 free (retVal); 2024 free (retVal);
2025 return NULL; 2025 return NULL;
2026 } 2026 }
@@ -2535,7 +2535,7 @@ MHD_stop_daemon (struct MHD_Daemon *daemon)
2535 SHUTDOWN (fd, SHUT_RDWR); 2535 SHUTDOWN (fd, SHUT_RDWR);
2536#else 2536#else
2537 if (daemon->wpipe[1] != -1) 2537 if (daemon->wpipe[1] != -1)
2538 write (daemon->wpipe[1], "e", 1); 2538 WRITE (daemon->wpipe[1], "e", 1);
2539#endif 2539#endif
2540#if DEBUG_CLOSE 2540#if DEBUG_CLOSE
2541#if HAVE_MESSAGES 2541#if HAVE_MESSAGES
@@ -2615,9 +2615,9 @@ MHD_stop_daemon (struct MHD_Daemon *daemon)
2615 2615
2616 /* just to be sure, remove the one char we 2616 /* just to be sure, remove the one char we
2617 wrote into the pipe */ 2617 wrote into the pipe */
2618 (void) read (daemon->wpipe[0], &c, 1); 2618 (void) READ (daemon->wpipe[0], &c, 1);
2619 close (daemon->wpipe[0]); 2619 CLOSE (daemon->wpipe[0]);
2620 close (daemon->wpipe[1]); 2620 CLOSE (daemon->wpipe[1]);
2621 } 2621 }
2622#endif 2622#endif
2623 2623