diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-02-13 18:28:36 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-02-13 18:28:36 -0500 |
| commit | d23bd26bec787ebbdbd41be0204e9cb83baf4dbd (patch) | |
| tree | dda05b0ebb3858e913b0ca3b864705e989bb7661 /include | |
| parent | b83de1151aab6dcc9f300159e31198364000de70 (diff) | |
| parent | a9a08b1e2f5b7a9e3ab7c7f75c768389b1d8238f (diff) | |
| download | mariadb-git-d23bd26bec787ebbdbd41be0204e9cb83baf4dbd.tar.gz | |
Merge tag 'mariadb-5.5.48' into 5.5-galera
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_context.h | 2 | ||||
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | include/my_pthread.h | 2 | ||||
| -rw-r--r-- | include/violite.h | 4 | ||||
| -rw-r--r-- | include/welcome_copyright_notice.h | 6 |
5 files changed, 11 insertions, 5 deletions
diff --git a/include/my_context.h b/include/my_context.h index b5daca25bba..dd44103d3b2 100644 --- a/include/my_context.h +++ b/include/my_context.h @@ -31,7 +31,7 @@ #define MY_CONTEXT_USE_X86_64_GCC_ASM #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) #define MY_CONTEXT_USE_I386_GCC_ASM -#elif defined(HAVE_UCONTEXT) +#elif defined(HAVE_UCONTEXT_H) #define MY_CONTEXT_USE_UCONTEXT #else #define MY_CONTEXT_DISABLE diff --git a/include/my_global.h b/include/my_global.h index 09adc9989ef..9e9651b7409 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -436,7 +436,7 @@ extern "C" int madvise(void *addr, size_t len, int behav); #endif #ifndef STDERR_FILENO -#define STDERR_FILENO 2 +#define STDERR_FILENO fileno(stderr) #endif /* diff --git a/include/my_pthread.h b/include/my_pthread.h index 17c971cd621..9b5703dedb7 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -86,10 +86,12 @@ typedef volatile LONG my_pthread_once_t; #define MY_PTHREAD_ONCE_INPROGRESS 1 #define MY_PTHREAD_ONCE_DONE 2 +#if !STRUCT_TIMESPEC_HAS_TV_SEC || !STRUCT_TIMESPEC_HAS_TV_NSEC struct timespec { time_t tv_sec; long tv_nsec; }; +#endif int win_pthread_mutex_trylock(pthread_mutex_t *mutex); int pthread_create(pthread_t *, const pthread_attr_t *, pthread_handler, void *); diff --git a/include/violite.h b/include/violite.h index 14c99e8d8fe..ea7e3d7897c 100644 --- a/include/violite.h +++ b/include/violite.h @@ -123,6 +123,10 @@ typedef my_socket YASSL_SOCKET_T; #include <openssl/ssl.h> #include <openssl/err.h> +#ifdef HAVE_ERR_remove_thread_state +#define ERR_remove_state(X) ERR_remove_thread_state(NULL) +#endif + enum enum_ssl_init_error { SSL_INITERR_NOERROR= 0, SSL_INITERR_CERT, SSL_INITERR_KEY, diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index 096d42446bc..e9891856221 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. - Copyright (c) 2011, 2015, MariaDB +/* Copyright (c) 2011, 2016, Oracle and/or its affiliates. + Copyright (c) 2011, 2016, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ #ifndef _welcome_copyright_notice_h_ #define _welcome_copyright_notice_h_ -#define COPYRIGHT_NOTICE_CURRENT_YEAR "2015" +#define COPYRIGHT_NOTICE_CURRENT_YEAR "2016" /* This define specifies copyright notice which is displayed by every MySQL |