diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-05 20:33:10 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-05 20:33:10 +0300 |
| commit | 2c3c851d2cba73825f81cd06220138b15c17ae4d (patch) | |
| tree | 4130cf52868c41beb3c242ad229031cca73d7e1c /include/my_global.h | |
| parent | 474290540a829edcc6a74be8c354053f330bf5de (diff) | |
| parent | 8648b9bed86e9f52c027daec760d6ab5ce52e889 (diff) | |
| download | mariadb-git-2c3c851d2cba73825f81cd06220138b15c17ae4d.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/my_global.h b/include/my_global.h index ae12f233734..ae8835a2a50 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -561,13 +561,6 @@ typedef int my_socket; /* File descriptor for sockets */ #endif /* Type for functions 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 */ typedef char puchar; /* Mixed prototypes can take char */ |