mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-11-29 06:40:59 +01:00
CLEANUP: remove THREAD_LOCAL from config.h
This one really ought to be defined in hathreads.h like all other thread definitions, which is what this patch does. As expected, all files but one (regex.h) were already including hathreads.h when using THREAD_LOCAL; regex.h was fixed for this. This was the last entry in config.h which is now useless.
This commit is contained in:
parent
3bc4e8bfe6
commit
5778fea4da
@ -26,10 +26,4 @@
|
|||||||
#include <common/compat.h>
|
#include <common/compat.h>
|
||||||
#include <common/defaults.h>
|
#include <common/defaults.h>
|
||||||
|
|
||||||
#ifdef USE_THREAD
|
|
||||||
#define THREAD_LOCAL __thread
|
|
||||||
#else
|
|
||||||
#define THREAD_LOCAL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _COMMON_CONFIG_H */
|
#endif /* _COMMON_CONFIG_H */
|
||||||
|
|||||||
@ -44,6 +44,7 @@
|
|||||||
|
|
||||||
#ifndef USE_THREAD
|
#ifndef USE_THREAD
|
||||||
|
|
||||||
|
#define THREAD_LOCAL /* empty */
|
||||||
#define MAX_THREADS 1
|
#define MAX_THREADS 1
|
||||||
#define MAX_THREADS_MASK 1
|
#define MAX_THREADS_MASK 1
|
||||||
|
|
||||||
@ -258,6 +259,8 @@ static inline unsigned long thread_isolated()
|
|||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <import/plock.h>
|
#include <import/plock.h>
|
||||||
|
|
||||||
|
#define THREAD_LOCAL __thread
|
||||||
|
|
||||||
#ifndef MAX_THREADS
|
#ifndef MAX_THREADS
|
||||||
#define MAX_THREADS LONGBITS
|
#define MAX_THREADS LONGBITS
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -26,6 +26,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <common/config.h>
|
#include <common/config.h>
|
||||||
|
#include <common/hathreads.h>
|
||||||
|
|
||||||
#ifdef USE_PCRE
|
#ifdef USE_PCRE
|
||||||
#include <pcre.h>
|
#include <pcre.h>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user