diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-19 14:24:38 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-19 14:24:38 -0500 |
| commit | dad555a09c8d590132c77c192a18d7fc1f8fe91e (patch) | |
| tree | 38fb545e5df0a24333b8284c816f5bea95d19a03 /include/my_global.h | |
| parent | 18173ddfc4081407832d9a6703d1b8356b7defe9 (diff) | |
| parent | 90ea0145856338221803ebb9b446ed2a6e082412 (diff) | |
| download | mariadb-git-dad555a09c8d590132c77c192a18d7fc1f8fe91e.tar.gz | |
Merge tag 'mariadb-10.0.23' into 10.0-galera
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 9d77a923710..43bde96f684 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -555,7 +555,11 @@ typedef int my_socket; /* File descriptor for sockets */ /* Type for fuctions that handles signals */ #define sig_handler RETSIGTYPE C_MODE_START +#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 */ |