diff options
| author | mysqldev@mysql.com <> | 2005-02-03 17:00:51 +0100 |
|---|---|---|
| committer | mysqldev@mysql.com <> | 2005-02-03 17:00:51 +0100 |
| commit | a4a34a87c8793f699b237c0125843e70284657d0 (patch) | |
| tree | bda54d6a666bd0b656d95c077b4dc4b22a7b96e3 /include | |
| parent | b233ddba8ef89e0cb30c0f4358ae9e692945d0b2 (diff) | |
| parent | ff073f34a1845cad62a37756787c1b8ecb5fdf2c (diff) | |
| download | mariadb-git-a4a34a87c8793f699b237c0125843e70284657d0.tar.gz | |
corrected automerge error
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index f27eb4733bd..f5cd8edeab9 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -135,7 +135,13 @@ #ifdef HAVE_UNIXWARE7_THREADS #include <thread.h> #else +#if defined(HPUX10) || defined(HPUX11) +C_MODE_START /* HPUX needs this, signal.h bug */ +#include <pthread.h> +C_MODE_END +#else #include <pthread.h> /* AIX must have this included first */ +#endif #endif /* HAVE_UNIXWARE7_THREADS */ #endif /* HAVE_mit_thread */ #if !defined(SCO) && !defined(_REENTRANT) |