[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36051 - in libmicrohttpd/src: include microhttpd platform
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36051 - in libmicrohttpd/src: include microhttpd platform |
Date: |
Tue, 7 Jul 2015 20:32:46 +0200 |
Author: Karlson2k
Date: 2015-07-07 20:32:45 +0200 (Tue, 07 Jul 2015)
New Revision: 36051
Modified:
libmicrohttpd/src/include/microhttpd.h
libmicrohttpd/src/include/platform.h
libmicrohttpd/src/include/platform_interface.h
libmicrohttpd/src/include/w32functions.h
libmicrohttpd/src/microhttpd/daemon.c
libmicrohttpd/src/microhttpd/postprocessor.c
libmicrohttpd/src/microhttpd/tsearch.c
libmicrohttpd/src/platform/w32functions.c
Log:
Fix C++-style comments
Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h 2015-07-07 18:32:33 UTC (rev
36050)
+++ libmicrohttpd/src/include/microhttpd.h 2015-07-07 18:32:45 UTC (rev
36051)
@@ -113,7 +113,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 */
#else
#include <unistd.h>
#include <sys/time.h>
Modified: libmicrohttpd/src/include/platform.h
===================================================================
--- libmicrohttpd/src/include/platform.h 2015-07-07 18:32:33 UTC (rev
36050)
+++ libmicrohttpd/src/include/platform.h 2015-07-07 18:32:45 UTC (rev
36051)
@@ -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
Modified: libmicrohttpd/src/include/platform_interface.h
===================================================================
--- libmicrohttpd/src/include/platform_interface.h 2015-07-07 18:32:33 UTC
(rev 36050)
+++ libmicrohttpd/src/include/platform_interface.h 2015-07-07 18:32:45 UTC
(rev 36051)
@@ -341,4 +341,4 @@
((NULL != (mutex)) ? (LeaveCriticalSection((mutex)), MHD_YES) : MHD_NO)
#endif
-#endif // MHD_PLATFORM_INTERFACE_H
+#endif /* MHD_PLATFORM_INTERFACE_H */
Modified: libmicrohttpd/src/include/w32functions.h
===================================================================
--- libmicrohttpd/src/include/w32functions.h 2015-07-07 18:32:33 UTC (rev
36050)
+++ libmicrohttpd/src/include/w32functions.h 2015-07-07 18:32:45 UTC (rev
36051)
@@ -210,4 +210,4 @@
#ifdef __cplusplus
}
#endif
-#endif //MHD_W32FUNCTIONS_H
+#endif /* MHD_W32FUNCTIONS_H */
Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c 2015-07-07 18:32:33 UTC (rev
36050)
+++ libmicrohttpd/src/microhttpd/daemon.c 2015-07-07 18:32:45 UTC (rev
36051)
@@ -640,10 +640,10 @@
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 @@
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 @@
#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"))
Modified: libmicrohttpd/src/microhttpd/postprocessor.c
===================================================================
--- libmicrohttpd/src/microhttpd/postprocessor.c 2015-07-07 18:32:33 UTC
(rev 36050)
+++ libmicrohttpd/src/microhttpd/postprocessor.c 2015-07-07 18:32:45 UTC
(rev 36051)
@@ -540,7 +540,7 @@
{
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)))
Modified: libmicrohttpd/src/microhttpd/tsearch.c
===================================================================
--- libmicrohttpd/src/microhttpd/tsearch.c 2015-07-07 18:32:33 UTC (rev
36050)
+++ libmicrohttpd/src/microhttpd/tsearch.c 2015-07-07 18:32:45 UTC (rev
36051)
@@ -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>
Modified: libmicrohttpd/src/platform/w32functions.c
===================================================================
--- libmicrohttpd/src/platform/w32functions.c 2015-07-07 18:32:33 UTC (rev
36050)
+++ libmicrohttpd/src/platform/w32functions.c 2015-07-07 18:32:45 UTC (rev
36051)
@@ -679,10 +679,10 @@
#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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36051 - in libmicrohttpd/src: include microhttpd platform,
gnunet <=