diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-12-29 19:37:11 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-12-29 19:37:11 +0400 |
| commit | 2ba7ed77aab05004f0c853a77850e325b78a1892 (patch) | |
| tree | 943659d76215e16d0d1946c28683c562debeff34 /include/my_global.h | |
| parent | 63f0669fd6dc430b60ffd5de0bff9854622a1c1a (diff) | |
| parent | 1bb66ea88c4679d6bd3ad1472d75983e66f679ae (diff) | |
| download | mariadb-git-2ba7ed77aab05004f0c853a77850e325b78a1892.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index a15f483f509..befc3bf4672 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -545,7 +545,11 @@ typedef int my_socket; /* File descriptor for sockets */ /* Type for fuctions that handles signals */ #define sig_handler RETSIGTYPE C_MODE_START -typedef void (*sig_return)(); /* Returns type from signal */ +#ifdef HAVE_SIGHANDLER_T +#define sig_return sighandler_t +#else +typedef void (*sig_return)(void); /* Returns type from signal */ +#endif C_MODE_END #if defined(__GNUC__) && !defined(_lint) typedef char pchar; /* Mixed prototypes can take char */ |