diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_alarm.h | 7 | ||||
| -rw-r--r-- | include/my_global.h | 7 | ||||
| -rw-r--r-- | include/violite.h | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/include/my_alarm.h b/include/my_alarm.h index 6010da6e2c3..bc0004476ca 100644 --- a/include/my_alarm.h +++ b/include/my_alarm.h @@ -29,6 +29,13 @@ extern ulong my_time_to_wait_for_lock; #if defined(HAVE_ALARM) && !defined(NO_ALARM_LOOP) #include <signal.h> +#ifdef HAVE_SIGHANDLER_T +#define sig_return sighandler_t +#elif defined(SOLARIS) || defined(__sun) || defined(__APPLE__) +typedef void (*sig_return)(int); /* Returns type from signal */ +#else +typedef void (*sig_return)(void); /* Returns type from signal */ +#endif #define ALARM_VARIABLES uint alarm_old=0; \ sig_return alarm_signal=0 #define ALARM_INIT my_have_got_alarm=0 ; \ diff --git a/include/my_global.h b/include/my_global.h index 8103f82a7e2..5e96400eac1 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -531,13 +531,6 @@ typedef int my_socket; /* File descriptor for sockets */ #endif /* 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 */ typedef char puchar; /* Mixed prototypes can take char */ diff --git a/include/violite.h b/include/violite.h index 45273ac5f24..b9ab7aeb99a 100644 --- a/include/violite.h +++ b/include/violite.h @@ -138,6 +138,9 @@ typedef my_socket YASSL_SOCKET_T; #define YASSL_SOCKET_T_DEFINED #include <openssl/ssl.h> #include <openssl/err.h> +#ifdef DEPRECATED +#undef DEPRECATED +#endif enum enum_ssl_init_error { |