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

Use CRYPTO_set_id_callback only if sizeof(pthread_t)<=sizeof(unsigned long). Use the system default otherwise

Browse Source
This commit is contained in:
bel
2015-09-09 22:20:16 +02:00
parent b567e04495
commit b5775bfc26
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/civetweb.c
View File

@@ -9551,7 +9551,7 @@ ssl_locking_callback(int mode, int mutex_num, const char *file, int line)
} }
} }
#if sizeof(pthread_t) <= sizeof(unsigned long)
static unsigned long ssl_id_callback(void) static unsigned long ssl_id_callback(void)
{ {
/* CRYPTO_set_id_callback() assumes thread IDs can be represented by /* CRYPTO_set_id_callback() assumes thread IDs can be represented by
@@ -9562,6 +9562,9 @@ static unsigned long ssl_id_callback(void)
return (unsigned long)pthread_self(); return (unsigned long)pthread_self();
} }
#else
#define pthread_t_LARGER_THAN_unsigned_long
#endif
#if !defined(NO_SSL_DL) #if !defined(NO_SSL_DL)
@@ -9656,7 +9659,11 @@ static int initialize_ssl(struct mg_context *ctx)
} }
CRYPTO_set_locking_callback(&ssl_locking_callback); CRYPTO_set_locking_callback(&ssl_locking_callback);
#ifndef pthread_t_LARGER_THAN_unsigned_long
/* Cannot use this function if sizeof(pthread_t) > sizeof(unsigned long) */
CRYPTO_set_id_callback(&ssl_id_callback); CRYPTO_set_id_callback(&ssl_id_callback);
#endif
return 1; return 1;
} }