diff options
| -rw-r--r-- | cmd-line-utils/libedit/chartype.h | 2 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/np/unvis.c | 2 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/np/vis.c | 2 | ||||
| -rw-r--r-- | mysys/my_getsystime.c | 2 | ||||
| -rw-r--r-- | plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
6 files changed, 7 insertions, 4 deletions
diff --git a/cmd-line-utils/libedit/chartype.h b/cmd-line-utils/libedit/chartype.h index 40012afb47d..576abe13ad5 100644 --- a/cmd-line-utils/libedit/chartype.h +++ b/cmd-line-utils/libedit/chartype.h @@ -49,7 +49,7 @@ TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ #if !defined(__NetBSD__) && !defined(__sun) \ && !(defined(__APPLE__) && defined(__MACH__)) \ - && !defined(__FreeBSD__) && !defined(_AIX) + && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__OpenBSD__) #ifndef __STDC_ISO_10646__ /* In many places it is assumed that the first 127 code points are ASCII * compatible, so ensure wchar_t indeed does ISO 10646 and not some other diff --git a/cmd-line-utils/libedit/np/unvis.c b/cmd-line-utils/libedit/np/unvis.c index 812d280b2d8..a911720ad35 100644 --- a/cmd-line-utils/libedit/np/unvis.c +++ b/cmd-line-utils/libedit/np/unvis.c @@ -64,7 +64,7 @@ static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93"; #include "np/vis.h" #ifdef __weak_alias -__weak_alias(strnunvisx,_strnunvisx) +__weak_alias(strnunvisx,_strnunvisx); #endif #if !HAVE_VIS diff --git a/cmd-line-utils/libedit/np/vis.c b/cmd-line-utils/libedit/np/vis.c index d7cc37b4f47..884a7894332 100644 --- a/cmd-line-utils/libedit/np/vis.c +++ b/cmd-line-utils/libedit/np/vis.c @@ -77,7 +77,7 @@ #include <stdlib.h> #ifdef __weak_alias -__weak_alias(strvisx,_strvisx) +__weak_alias(strvisx,_strvisx); #endif #if !HAVE_VIS || !HAVE_SVIS diff --git a/mysys/my_getsystime.c b/mysys/my_getsystime.c index 268619a1334..8a3e97cffa7 100644 --- a/mysys/my_getsystime.c +++ b/mysys/my_getsystime.c @@ -124,7 +124,7 @@ void my_time_init() ulonglong my_getcputime() { -#ifdef HAVE_CLOCK_GETTIME +#ifdef CLOCK_THREAD_CPUTIME_ID struct timespec tp; if (clock_gettime(CLOCK_THREAD_CPUTIME_ID, &tp)) return 0; diff --git a/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp b/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp index 85887d1d55c..c254d17dff5 100644 --- a/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp +++ b/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp @@ -7,6 +7,7 @@ */ #include <my_config.h> +#include <sys/types.h> #include <netinet/in.h> #include <errno.h> #include <poll.h> diff --git a/sql/mysqld.cc b/sql/mysqld.cc index aa3942521ed..36be99fc25c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2678,6 +2678,7 @@ static void init_signals(void) my_sigset(THR_SERVER_ALARM,print_signal_warning); // Should never be called! +#ifdef HAVE_STACKTRACE if (opt_stack_trace || (test_flags & TEST_CORE_ON_SIGNAL)) { sa.sa_flags = SA_RESETHAND | SA_NODEFER; @@ -2700,6 +2701,7 @@ static void init_signals(void) sigaction(SIGILL, &sa, NULL); sigaction(SIGFPE, &sa, NULL); } +#endif #ifdef HAVE_GETRLIMIT if (test_flags & TEST_CORE_ON_SIGNAL) |