aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/include/microhttpd.h2
-rw-r--r--src/include/platform.h12
-rw-r--r--src/include/platform_interface.h2
-rw-r--r--src/include/w32functions.h2
-rw-r--r--src/microhttpd/daemon.c10
-rw-r--r--src/microhttpd/postprocessor.c2
-rw-r--r--src/microhttpd/tsearch.c2
-rw-r--r--src/platform/w32functions.c8
8 files changed, 20 insertions, 20 deletions
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 6e12fa5e..27a3ddf1 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -113,7 +113,7 @@ extern "C"
113#if defined(_MSC_FULL_VER) && !defined (_SSIZE_T_DEFINED) 113#if defined(_MSC_FULL_VER) && !defined (_SSIZE_T_DEFINED)
114#define _SSIZE_T_DEFINED 114#define _SSIZE_T_DEFINED
115typedef intptr_t ssize_t; 115typedef intptr_t ssize_t;
116#endif // !_SSIZE_T_DEFINED */ 116#endif /* !_SSIZE_T_DEFINED */
117#else 117#else
118#include <unistd.h> 118#include <unistd.h>
119#include <sys/time.h> 119#include <sys/time.h>
diff --git a/src/include/platform.h b/src/include/platform.h
index 9e33ee70..a19e0970 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -68,15 +68,15 @@
68#if defined(_WIN32) 68#if defined(_WIN32)
69#ifndef _WIN32_WINNT 69#ifndef _WIN32_WINNT
70#define _WIN32_WINNT 0x0501 70#define _WIN32_WINNT 0x0501
71#else // _WIN32_WINNT 71#else /* _WIN32_WINNT */
72#if _WIN32_WINNT < 0x0501 72#if _WIN32_WINNT < 0x0501
73#error "Headers for Windows XP or later are required" 73#error "Headers for Windows XP or later are required"
74#endif // _WIN32_WINNT < 0x0501 74#endif /* _WIN32_WINNT < 0x0501 */
75#endif // _WIN32_WINNT 75#endif /* _WIN32_WINNT */
76#ifndef WIN32_LEAN_AND_MEAN 76#ifndef WIN32_LEAN_AND_MEAN
77#define WIN32_LEAN_AND_MEAN 1 77#define WIN32_LEAN_AND_MEAN 1
78#endif /* !WIN32_LEAN_AND_MEAN */ 78#endif /* !WIN32_LEAN_AND_MEAN */
79#endif // _WIN32 79#endif /* _WIN32 */
80 80
81#if LINUX+0 && (defined(HAVE_SENDFILE64) || defined(HAVE_LSEEK64)) && ! defined(_LARGEFILE64_SOURCE) 81#if LINUX+0 && (defined(HAVE_SENDFILE64) || defined(HAVE_LSEEK64)) && ! defined(_LARGEFILE64_SOURCE)
82#define _LARGEFILE64_SOURCE 1 82#define _LARGEFILE64_SOURCE 1
@@ -98,7 +98,7 @@
98#undef HAVE_CONFIG_H 98#undef HAVE_CONFIG_H
99#include <pthread.h> 99#include <pthread.h>
100#define HAVE_CONFIG_H 1 100#define HAVE_CONFIG_H 1
101#endif // MHD_USE_POSIX_THREADS 101#endif /* MHD_USE_POSIX_THREADS */
102 102
103/* different OSes have fd_set in 103/* different OSes have fd_set in
104 a broad range of header files; 104 a broad range of header files;
@@ -171,7 +171,7 @@
171#if defined(_MSC_FULL_VER) && !defined (_SSIZE_T_DEFINED) 171#if defined(_MSC_FULL_VER) && !defined (_SSIZE_T_DEFINED)
172#define _SSIZE_T_DEFINED 172#define _SSIZE_T_DEFINED
173typedef intptr_t ssize_t; 173typedef intptr_t ssize_t;
174#endif // !_SSIZE_T_DEFINED */ 174#endif /* !_SSIZE_T_DEFINED */
175#ifndef MHD_SOCKET_DEFINED 175#ifndef MHD_SOCKET_DEFINED
176/** 176/**
177 * MHD_socket is type for socket FDs 177 * MHD_socket is type for socket FDs
diff --git a/src/include/platform_interface.h b/src/include/platform_interface.h
index 766cd3aa..d9adedef 100644
--- a/src/include/platform_interface.h
+++ b/src/include/platform_interface.h
@@ -341,4 +341,4 @@ typedef pthread_mutex_t MHD_mutex_;
341 ((NULL != (mutex)) ? (LeaveCriticalSection((mutex)), MHD_YES) : MHD_NO) 341 ((NULL != (mutex)) ? (LeaveCriticalSection((mutex)), MHD_YES) : MHD_NO)
342#endif 342#endif
343 343
344#endif // MHD_PLATFORM_INTERFACE_H 344#endif /* MHD_PLATFORM_INTERFACE_H */
diff --git a/src/include/w32functions.h b/src/include/w32functions.h
index a86c4b25..057a989e 100644
--- a/src/include/w32functions.h
+++ b/src/include/w32functions.h
@@ -210,4 +210,4 @@ void W32_SetThreadName(const DWORD thread_id, const char *thread_name);
210#ifdef __cplusplus 210#ifdef __cplusplus
211} 211}
212#endif 212#endif
213#endif //MHD_W32FUNCTIONS_H 213#endif /* MHD_W32FUNCTIONS_H */
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index da8477e4..37fb6188 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -640,10 +640,10 @@ add_to_fd_set (MHD_socket fd,
640 else 640 else
641 return MHD_NO; 641 return MHD_NO;
642 } 642 }
643#else // ! MHD_WINSOCK_SOCKETS 643#else /* ! MHD_WINSOCK_SOCKETS */
644 if (fd >= fd_setsize) 644 if (fd >= fd_setsize)
645 return MHD_NO; 645 return MHD_NO;
646#endif // ! MHD_WINSOCK_SOCKETS 646#endif /* ! MHD_WINSOCK_SOCKETS */
647 FD_SET (fd, set); 647 FD_SET (fd, set);
648 if ( (NULL != max_fd) && (MHD_INVALID_SOCKET != fd) && 648 if ( (NULL != max_fd) && (MHD_INVALID_SOCKET != fd) &&
649 ((fd > *max_fd) || (MHD_INVALID_SOCKET == *max_fd)) ) 649 ((fd > *max_fd) || (MHD_INVALID_SOCKET == *max_fd)) )
@@ -4827,8 +4827,8 @@ static struct gcry_thread_cbs gcry_threads_w32 = {
4827 gcry_w32_mutex_lock, gcry_w32_mutex_unlock, 4827 gcry_w32_mutex_lock, gcry_w32_mutex_unlock,
4828 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; 4828 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
4829 4829
4830#endif // defined(MHD_W32_MUTEX_) 4830#endif /* defined(MHD_W32_MUTEX_) */
4831#endif // HTTPS_SUPPORT && GCRYPT_VERSION_NUMBER < 0x010600 4831#endif /* HTTPS_SUPPORT && GCRYPT_VERSION_NUMBER < 0x010600 */
4832 4832
4833 4833
4834/** 4834/**
@@ -4855,7 +4855,7 @@ void MHD_init(void)
4855#elif defined(MHD_W32_MUTEX_) 4855#elif defined(MHD_W32_MUTEX_)
4856 if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_w32)) 4856 if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_w32))
4857 MHD_PANIC ("Failed to initialise multithreading in libgcrypt\n"); 4857 MHD_PANIC ("Failed to initialise multithreading in libgcrypt\n");
4858#endif // defined(MHD_W32_MUTEX_) 4858#endif /* defined(MHD_W32_MUTEX_) */
4859 gcry_check_version (NULL); 4859 gcry_check_version (NULL);
4860#else 4860#else
4861 if (NULL == gcry_check_version ("1.6.0")) 4861 if (NULL == gcry_check_version ("1.6.0"))
diff --git a/src/microhttpd/postprocessor.c b/src/microhttpd/postprocessor.c
index d371f3d0..8dad8ee1 100644
--- a/src/microhttpd/postprocessor.c
+++ b/src/microhttpd/postprocessor.c
@@ -540,7 +540,7 @@ find_boundary (struct MHD_PostProcessor *pp,
540 { 540 {
541 if (pp->buffer_pos == pp->buffer_size) 541 if (pp->buffer_pos == pp->buffer_size)
542 pp->state = PP_Error; /* out of memory */ 542 pp->state = PP_Error; /* out of memory */
543 // ++(*ioffptr); 543 /* ++(*ioffptr); */
544 return MHD_NO; /* not enough data */ 544 return MHD_NO; /* not enough data */
545 } 545 }
546 if ((0 != memcmp ("--", buf, 2)) || (0 != memcmp (&buf[2], boundary, blen))) 546 if ((0 != memcmp ("--", buf, 2)) || (0 != memcmp (&buf[2], boundary, blen)))
diff --git a/src/microhttpd/tsearch.c b/src/microhttpd/tsearch.c
index 8889f32d..d4418f18 100644
--- a/src/microhttpd/tsearch.c
+++ b/src/microhttpd/tsearch.c
@@ -13,7 +13,7 @@
13 13
14#ifndef _MSC_FULL_VER 14#ifndef _MSC_FULL_VER
15#include <sys/cdefs.h> 15#include <sys/cdefs.h>
16#endif //! _MSC_FULL_VER 16#endif /*! _MSC_FULL_VER */
17#define _SEARCH_PRIVATE 17#define _SEARCH_PRIVATE
18#include "tsearch.h" 18#include "tsearch.h"
19#include <stdlib.h> 19#include <stdlib.h>
diff --git a/src/platform/w32functions.c b/src/platform/w32functions.c
index bc42fef4..ff4bccf8 100644
--- a/src/platform/w32functions.c
+++ b/src/platform/w32functions.c
@@ -679,10 +679,10 @@ void W32_SetThreadName(const DWORD thread_id, const char *thread_name)
679#pragma pack(push,8) 679#pragma pack(push,8)
680 struct thread_info_struct 680 struct thread_info_struct
681 { 681 {
682 DWORD type; // Must be 0x1000. 682 DWORD type; /* Must be 0x1000. */
683 LPCSTR name; // Pointer to name (in user address space). 683 LPCSTR name; /* Pointer to name (in user address space). */
684 DWORD ID; // Thread ID (-1=caller thread). 684 DWORD ID; /* Thread ID (-1=caller thread). */
685 DWORD flags; // Reserved for future use, must be zero. 685 DWORD flags; /* Reserved for future use, must be zero. */
686 } thread_info; 686 } thread_info;
687#pragma pack(pop) 687#pragma pack(pop)
688 688