libmicrohttpd

HTTP/1.x server C library (MHD 1.x, stable)
Log | Files | Refs | Submodules | README | LICENSE

commit c69306c17d3d71389706ed59d2a71e97570aaea1
parent 2c842e6b95498e1dc56584b7e0c1570b9cd0792c
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date:   Tue,  7 Jul 2015 18:32:45 +0000

Fix C++-style comments

Diffstat:
Msrc/include/microhttpd.h | 2+-
Msrc/include/platform.h | 12++++++------
Msrc/include/platform_interface.h | 2+-
Msrc/include/w32functions.h | 2+-
Msrc/microhttpd/daemon.c | 10+++++-----
Msrc/microhttpd/postprocessor.c | 2+-
Msrc/microhttpd/tsearch.c | 2+-
Msrc/platform/w32functions.c | 8++++----
8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h @@ -113,7 +113,7 @@ extern "C" #if defined(_MSC_FULL_VER) && !defined (_SSIZE_T_DEFINED) #define _SSIZE_T_DEFINED typedef intptr_t ssize_t; -#endif // !_SSIZE_T_DEFINED */ +#endif /* !_SSIZE_T_DEFINED */ #else #include <unistd.h> #include <sys/time.h> diff --git a/src/include/platform.h b/src/include/platform.h @@ -68,15 +68,15 @@ #if defined(_WIN32) #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0501 -#else // _WIN32_WINNT +#else /* _WIN32_WINNT */ #if _WIN32_WINNT < 0x0501 #error "Headers for Windows XP or later are required" -#endif // _WIN32_WINNT < 0x0501 -#endif // _WIN32_WINNT +#endif /* _WIN32_WINNT < 0x0501 */ +#endif /* _WIN32_WINNT */ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 #endif /* !WIN32_LEAN_AND_MEAN */ -#endif // _WIN32 +#endif /* _WIN32 */ #if LINUX+0 && (defined(HAVE_SENDFILE64) || defined(HAVE_LSEEK64)) && ! defined(_LARGEFILE64_SOURCE) #define _LARGEFILE64_SOURCE 1 @@ -98,7 +98,7 @@ #undef HAVE_CONFIG_H #include <pthread.h> #define HAVE_CONFIG_H 1 -#endif // MHD_USE_POSIX_THREADS +#endif /* MHD_USE_POSIX_THREADS */ /* different OSes have fd_set in a broad range of header files; @@ -171,7 +171,7 @@ #if defined(_MSC_FULL_VER) && !defined (_SSIZE_T_DEFINED) #define _SSIZE_T_DEFINED typedef intptr_t ssize_t; -#endif // !_SSIZE_T_DEFINED */ +#endif /* !_SSIZE_T_DEFINED */ #ifndef MHD_SOCKET_DEFINED /** * MHD_socket is type for socket FDs diff --git a/src/include/platform_interface.h b/src/include/platform_interface.h @@ -341,4 +341,4 @@ typedef pthread_mutex_t MHD_mutex_; ((NULL != (mutex)) ? (LeaveCriticalSection((mutex)), MHD_YES) : MHD_NO) #endif -#endif // MHD_PLATFORM_INTERFACE_H +#endif /* MHD_PLATFORM_INTERFACE_H */ diff --git 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); #ifdef __cplusplus } #endif -#endif //MHD_W32FUNCTIONS_H +#endif /* MHD_W32FUNCTIONS_H */ diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c @@ -640,10 +640,10 @@ add_to_fd_set (MHD_socket fd, else return MHD_NO; } -#else // ! MHD_WINSOCK_SOCKETS +#else /* ! MHD_WINSOCK_SOCKETS */ if (fd >= fd_setsize) return MHD_NO; -#endif // ! MHD_WINSOCK_SOCKETS +#endif /* ! MHD_WINSOCK_SOCKETS */ FD_SET (fd, set); if ( (NULL != max_fd) && (MHD_INVALID_SOCKET != fd) && ((fd > *max_fd) || (MHD_INVALID_SOCKET == *max_fd)) ) @@ -4827,8 +4827,8 @@ static struct gcry_thread_cbs gcry_threads_w32 = { gcry_w32_mutex_lock, gcry_w32_mutex_unlock, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; -#endif // defined(MHD_W32_MUTEX_) -#endif // HTTPS_SUPPORT && GCRYPT_VERSION_NUMBER < 0x010600 +#endif /* defined(MHD_W32_MUTEX_) */ +#endif /* HTTPS_SUPPORT && GCRYPT_VERSION_NUMBER < 0x010600 */ /** @@ -4855,7 +4855,7 @@ void MHD_init(void) #elif defined(MHD_W32_MUTEX_) if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_w32)) MHD_PANIC ("Failed to initialise multithreading in libgcrypt\n"); -#endif // defined(MHD_W32_MUTEX_) +#endif /* defined(MHD_W32_MUTEX_) */ gcry_check_version (NULL); #else if (NULL == gcry_check_version ("1.6.0")) diff --git a/src/microhttpd/postprocessor.c b/src/microhttpd/postprocessor.c @@ -540,7 +540,7 @@ find_boundary (struct MHD_PostProcessor *pp, { if (pp->buffer_pos == pp->buffer_size) pp->state = PP_Error; /* out of memory */ - // ++(*ioffptr); + /* ++(*ioffptr); */ return MHD_NO; /* not enough data */ } if ((0 != memcmp ("--", buf, 2)) || (0 != memcmp (&buf[2], boundary, blen))) diff --git a/src/microhttpd/tsearch.c b/src/microhttpd/tsearch.c @@ -13,7 +13,7 @@ #ifndef _MSC_FULL_VER #include <sys/cdefs.h> -#endif //! _MSC_FULL_VER +#endif /*! _MSC_FULL_VER */ #define _SEARCH_PRIVATE #include "tsearch.h" #include <stdlib.h> diff --git 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) #pragma pack(push,8) struct thread_info_struct { - DWORD type; // Must be 0x1000. - LPCSTR name; // Pointer to name (in user address space). - DWORD ID; // Thread ID (-1=caller thread). - DWORD flags; // Reserved for future use, must be zero. + DWORD type; /* Must be 0x1000. */ + LPCSTR name; /* Pointer to name (in user address space). */ + DWORD ID; /* Thread ID (-1=caller thread). */ + DWORD flags; /* Reserved for future use, must be zero. */ } thread_info; #pragma pack(pop)