diff options
| author | monty@hundin.mysql.fi <> | 2001-12-17 03:02:58 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-12-17 03:02:58 +0200 |
| commit | 4dbd9e061c35d79e96079b05408dd584c09f2c15 (patch) | |
| tree | 941257314e6e021bd649a4b42156be700895e6a0 /include | |
| parent | fc3e066f36e3b084674cbb9f3febb67e0ddbbc09 (diff) | |
| download | mariadb-git-4dbd9e061c35d79e96079b05408dd584c09f2c15.tar.gz | |
Lots of portability fixes.
Fixed shutdown on HPUX.
Fixed bug in query cache.
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_string.h | 2 | ||||
| -rw-r--r-- | include/my_pthread.h | 5 | ||||
| -rw-r--r-- | include/raid.h | 9 |
3 files changed, 7 insertions, 9 deletions
diff --git a/include/m_string.h b/include/m_string.h index 6e906bef023..17b5a07a10b 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -131,11 +131,11 @@ extern void bzero(gptr dst,uint len); #if !defined(bcmp) && !defined(HAVE_BCMP) extern int bcmp(const char *s1,const char *s2,uint len); +#endif #ifdef HAVE_purify extern int my_bcmp(const char *s1,const char *s2,uint len); #define bcmp(A,B,C) my_bcmp((A),(B),(C)) #endif -#endif #ifndef bmove512 extern void bmove512(gptr dst,const gptr src,uint len); diff --git a/include/my_pthread.h b/include/my_pthread.h index df42ebeadd0..bee5f5d92f4 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -446,6 +446,10 @@ struct hostent *my_gethostbyname_r(const char *name, #endif /* defined(__WIN__) */ +#if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS) +#define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c)) +#endif + /* safe_mutex adds checking to mutex for easier debugging */ typedef struct st_safe_mutex_t @@ -476,6 +480,7 @@ int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp, #undef pthread_mutex_t #undef pthread_cond_wait #undef pthread_cond_timedwait +#undef pthread_mutex_trylock #define pthread_mutex_init(A,B) safe_mutex_init((A),(B)) #define pthread_mutex_lock(A) safe_mutex_lock((A),__FILE__,__LINE__) #define pthread_mutex_unlock(A) safe_mutex_unlock((A),__FILE__,__LINE__) diff --git a/include/raid.h b/include/raid.h index e2e2cf5a567..7655fbe09f7 100644 --- a/include/raid.h +++ b/include/raid.h @@ -23,14 +23,7 @@ #define RAID_DEFAULT_CHUNKSIZE 256*1024 /* 256kB */ extern const char *raid_type_string[]; - -#ifdef __cplusplus -extern "C" { -#endif -const char *my_raid_type(int raid_type); -#ifdef __cplusplus -} -#endif +#define my_raid_type(raid_type) raid_type_string[(int)(raid_type)] #if defined(USE_RAID) && !defined(DONT_USE_RAID) |