lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-12-22 04:02:04 +03:00
Code Activity

Some MacOS compile fixes

Browse Source
This commit is contained in:
bel
2015-09-06 21:45:37 +02:00
parent 38fecc8961
commit da2f30cb48
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/civetweb.c
View File

@@ -743,14 +743,18 @@ static void mg_snprintf(const struct mg_connection *conn,
#ifdef free #ifdef free
#undef free #undef free
#endif #endif
#ifdef snprintf
#undef snprintf
#endif
#ifdef vsnprintf
#undef vsnprintf
#endif
#define malloc DO_NOT_USE_THIS_FUNCTION__USE_mg_malloc #define malloc DO_NOT_USE_THIS_FUNCTION__USE_mg_malloc
#define calloc DO_NOT_USE_THIS_FUNCTION__USE_mg_calloc #define calloc DO_NOT_USE_THIS_FUNCTION__USE_mg_calloc
#define realloc DO_NOT_USE_THIS_FUNCTION__USE_mg_realloc #define realloc DO_NOT_USE_THIS_FUNCTION__USE_mg_realloc
#define free DO_NOT_USE_THIS_FUNCTION__USE_mg_free #define free DO_NOT_USE_THIS_FUNCTION__USE_mg_free
#define snprintf DO_NOT_USE_THIS_FUNCTION__USE_mg_snprintf #define snprintf DO_NOT_USE_THIS_FUNCTION__USE_mg_snprintf
#ifdef _WIN32 /* Don't use vsnprintf for Linux, Windows or anything else */
#define vsnprintf DO_NOT_USE_THIS_FUNCTION__USE_mg_vsnprintf #define vsnprintf DO_NOT_USE_THIS_FUNCTION__USE_mg_vsnprintf
#endif
#define MD5_STATIC static #define MD5_STATIC static
#include "md5.inl" #include "md5.inl"
@@ -1240,7 +1244,8 @@ static void mg_set_thread_name(const char *name)
#elif defined(__MINGW32__) #elif defined(__MINGW32__)
/* No option known to set thread name for MinGW */ /* No option known to set thread name for MinGW */
#endif #endif
#elif((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 12))) #elif defined(__GLIBC__) && \
((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 12)))
/* pthread_setname_np first appeared in glibc in version 2.12*/ /* pthread_setname_np first appeared in glibc in version 2.12*/
(void)pthread_setname_np(pthread_self(), threadName); (void)pthread_setname_np(pthread_self(), threadName);
#elif defined(__linux__) #elif defined(__linux__)