diff options
| author | monty@hundin.mysql.fi <> | 2002-08-12 04:04:43 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-08-12 04:04:43 +0300 |
| commit | 3ef9d44edcd3db115d03a6ed7e896c662ad2182e (patch) | |
| tree | 4ba65b7347df0448111dd1a3ab055bc2c8a1c6dc /include | |
| parent | c99c1fd38439a7c529dc24c03c5ff586ba694c57 (diff) | |
| parent | d825808a726960fa4fde7d4569c2d95014ca440f (diff) | |
| download | mariadb-git-3ef9d44edcd3db115d03a6ed7e896c662ad2182e.tar.gz | |
merge with 3.23.52
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_no_pthread.h | 2 | ||||
| -rw-r--r-- | include/my_sys.h | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/include/my_no_pthread.h b/include/my_no_pthread.h index 81c0de580db..0a034f78192 100644 --- a/include/my_no_pthread.h +++ b/include/my_no_pthread.h @@ -20,7 +20,7 @@ environment, easier to use. */ -#if !defined(_my_no_pthread_h) && !defined(THREADS) +#if !defined(_my_no_pthread_h) && !defined(THREAD) #define _my_no_pthread_h #define pthread_mutex_init(A,B) diff --git a/include/my_sys.h b/include/my_sys.h index de60b7b1a03..163fb72a910 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -158,22 +158,21 @@ extern my_string my_strdup(const char *from,myf MyFlags); #define CALLER_INFO /* nothing */ #define ORIG_CALLER_INFO /* nothing */ #endif + #ifdef HAVE_ALLOCA -#ifdef __GNUC__ -/* Remove any previous definitions. */ -#undef alloca -#define alloca(size) __builtin_alloca (size) -#else /* xlc */ -#ifdef _AIX - #pragma alloca +#if defined(_AIX) && !defined(__GNUC__) +#pragma alloca #endif /* _AIX */ -#endif /* __GNUC__ */ +#if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) +#define alloca __builtin_alloca +#endif /* GNUC */ #define my_alloca(SZ) alloca((size_t) (SZ)) #define my_afree(PTR) {} #else #define my_alloca(SZ) my_malloc(SZ,MYF(0)) #define my_afree(PTR) my_free(PTR,MYF(MY_WME)) #endif /* HAVE_ALLOCA */ + #ifdef MSDOS #ifdef __ZTC__ void * __CDECL halloc(long count,size_t length); |