diff options
| author | unknown <serg@serg.mysql.com> | 2002-06-30 23:35:59 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-06-30 23:35:59 +0000 |
| commit | e72b51a7e20676aeb809b7ca4abe451899ab5ac8 (patch) | |
| tree | dc1004eccf3f89248d8f6487251de12101d7db6f /include | |
| parent | a83334fc1ef2b21f5a806e708fcc26431cee273c (diff) | |
| parent | d90caf3d53a87fd1b52fde8e6a60314867c58513 (diff) | |
| download | mariadb-git-e72b51a7e20676aeb809b7ca4abe451899ab5ac8.tar.gz | |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 7 | ||||
| -rw-r--r-- | include/my_pthread.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 2ad8a870048..8dd509b9b54 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -150,6 +150,13 @@ #define __LONG_MAX__ 2147483647 #endif +/* Fix problem when linking c++ programs with gcc 3.x */ +#ifdef DEFINE_CXA_PURE_VIRTUAL +#define FIX_GCC_LINKING_PROBLEM extern "C" { int __cxa_pure_virtual() {return 0;} } +#else +#define FIX_GCC_LINKING_PROBLEM +#endif + /* egcs 1.1.2 has a problem with memcpy on Alpha */ #if defined(__GNUC__) && defined(__alpha__) && ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) #define BAD_MEMCPY diff --git a/include/my_pthread.h b/include/my_pthread.h index 0908f7b8ab9..038030540e8 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -429,6 +429,7 @@ struct tm *localtime_r(const time_t *clock, struct tm *res); #endif /* defined(__WIN__) */ #if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS) +#undef pthread_cond_timedwait #define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c)) #define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a)) int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, |