diff options
author | reggie@big_geek. <> | 2005-10-25 23:51:05 -0500 |
---|---|---|
committer | reggie@big_geek. <> | 2005-10-25 23:51:05 -0500 |
commit | dec2640dbf494666f295ea41b3aa943e88622b85 (patch) | |
tree | 168c12fe317b7418c271aa18a2c87ff8cbe1072c | |
parent | a4cc61f21351303e903a6511baa94990cec96380 (diff) | |
download | mariadb-git-dec2640dbf494666f295ea41b3aa943e88622b85.tar.gz |
changed define from EXTERN_C to EXTERNC so it doesn't conflict with
another macro defined in the Windows header files.
-rw-r--r-- | include/my_pthread.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 3d9056541d7..ee2c801ff6e 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -25,10 +25,10 @@ #endif #ifdef __cplusplus -#define EXTERN_C extern "C" +#define EXTERNC extern "C" extern "C" { #else -#define EXTERN_C +#define EXTERNC #endif /* __cplusplus */ #if defined(__WIN__) || defined(OS2) @@ -80,10 +80,10 @@ struct timespec { /* For pthread_cond_timedwait() */ typedef int pthread_mutexattr_t; #define win_pthread_self my_thread_var->pthread_self #ifdef OS2 -#define pthread_handler_t EXTERN_C void * _Optlink +#define pthread_handler_t EXTERNC void * _Optlink typedef void * (_Optlink *pthread_handler)(void *); #else -#define pthread_handler_t EXTERN_C void * __cdecl +#define pthread_handler_t EXTERNC void * __cdecl typedef void * (__cdecl *pthread_handler)(void *); #endif @@ -187,7 +187,7 @@ typedef int pthread_attr_t; /* Needed by Unixware 7.0.0 */ #define pthread_key_create(A,B) thr_keycreate((A),(B)) #define pthread_key_delete(A) thr_keydelete(A) -#define pthread_handler_t EXTERN_C void * +#define pthread_handler_t EXTERNC void * #define pthread_key(T,V) pthread_key_t V void * my_pthread_getspecific_imp(pthread_key_t key); @@ -265,7 +265,7 @@ extern int my_pthread_getprio(pthread_t thread_id); #define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,(V)) #define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,(void*) (V)) #define pthread_detach_this_thread() -#define pthread_handler_t EXTERN_C void * +#define pthread_handler_t EXTERNC void * typedef void *(* pthread_handler)(void *); /* Test first for RTS or FSU threads */ |