diff options
| author | monty@donna.mysql.com <> | 2000-08-29 12:31:01 +0300 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-08-29 12:31:01 +0300 |
| commit | 066d55c0c09d589d17bf466682134af50cb59e14 (patch) | |
| tree | 8c9e3c031400ac400edcf6561fe51f4bdbd69369 /include | |
| parent | d564acf14eb07cefedf0218c90fd109c61dc6e2f (diff) | |
| download | mariadb-git-066d55c0c09d589d17bf466682134af50cb59e14.tar.gz | |
Bug fixes for 3.23.23
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 2 | ||||
| -rw-r--r-- | include/global.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/config-win.h b/include/config-win.h index dc54895a5d9..a0008675d49 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -250,6 +250,8 @@ inline double ulonglong2double(ulonglong value) #define HAVE_RINT /* defined in this file */ #define NO_FCNTL_NONBLOCK /* No FCNTL */ #define HAVE_ALLOCA +#define HAVE_STRPBRK +#define HAVE_STRSTR #define HAVE_COMPRESS #ifdef NOT_USED diff --git a/include/global.h b/include/global.h index 27a7c54ede0..6ad6b068b98 100644 --- a/include/global.h +++ b/include/global.h @@ -110,7 +110,7 @@ #endif /* In Linux-alpha we have atomic.h if we are using gcc */ -#if defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && defined(__alpha__) && (__GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 95)) +#if defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && defined(__alpha__) && (__GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 95)) && !defined(HAVE_ATOMIC_ADD) #define HAVE_ATOMIC_ADD #define HAVE_ATOMIC_SUB #endif |