--- embedaddon/mpd/src/ppp.h 2013/07/22 08:44:29 1.1.1.2 +++ embedaddon/mpd/src/ppp.h 2023/09/27 11:08:01 1.1.1.3.2.1 @@ -68,6 +68,18 @@ /* Do our own version of assert() so it shows up in the logs */ #define assert(e) ((e) ? (void)0 : DoAssert(__FILE__, __LINE__, #e)) +#ifdef __clang__ +#ifndef NO_THREAD_SAFETY_ANALYSIS +#ifndef THREAD_ANNOTATION_ATTRIBUTE__ + #define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x)) +#endif + #define NO_THREAD_SAFETY_ANALYSIS \ + THREAD_ANNOTATION_ATTRIBUTE__(no_thread_safety_analysis) +#endif +#else + #define NO_THREAD_SAFETY_ANALYSIS +#endif /* __clang__ */ + /* Giant Mutex handling */ #define GIANT_MUTEX_LOCK() assert(pthread_mutex_lock(&gGiantMutex) == 0) #define GIANT_MUTEX_UNLOCK() assert(pthread_mutex_unlock(&gGiantMutex) == 0) @@ -191,7 +203,9 @@ extern int gNumBundles; /* Total number of bundles */ extern struct console gConsole; extern struct web gWeb; +#ifdef USE_RADIUS extern struct radsrv gRadsrv; +#endif extern int gBackground; extern int gShutdownInProgress; extern int gOverload; @@ -200,18 +214,18 @@ #ifdef PHYSTYPE_PPTP extern int gPPTPto; - extern int gPPTPtunlimit; + extern unsigned gPPTPtunlimit; #endif #ifdef PHYSTYPE_L2TP extern int gL2TPto; - extern int gL2TPtunlimit; + extern unsigned gL2TPtunlimit; #endif extern int gChildren; extern int gMaxChildren; extern struct globalconf gGlobalConf; /* Global config settings */ -#ifdef USE_NG_BPF +#if defined(USE_NG_BPF) && !defined(RADSRV) extern struct acl *acl_filters[ACL_FILTERS]; /* mpd's internal bpf filters */ #endif