diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-04 16:47:11 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-04 16:47:11 +0200 |
| commit | 7fb73ed1432f53d1d8ab6c7aeb299ac913727ce8 (patch) | |
| tree | a4931bf9418b28824d3ff4c68f4a2d888b584f65 /include/my_global.h | |
| parent | 42bba9782b36247c6c2241ea4d5996723af273fd (diff) | |
| parent | 5008fc709bca54bd29a4d3f35aebf6e25468b9dd (diff) | |
| download | mariadb-git-7fb73ed1432f53d1d8ab6c7aeb299ac913727ce8.tar.gz | |
Merge branch '10.2' into 10.3
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 a1cecdd8a6f..b96a04f4566 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -566,13 +566,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 */ |