mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
c238e9b96a
sig_return: Solaris/OSX returns different function ptr
Move defination to my_alarm.h as its the only use.
prevents compile warnings (copied from 10.3 branch)
mysys/my_sync.c:136:19: error: 'cur_dir_name' defined but not used [-Werror=unused-const-variable=]
136 | static const char cur_dir_name[]= {FN_CURLIB, 0};
| ^~~~~~~~~~~~
fix compile error (DEPRECATED) leaked from ssl headers.
In file included from /export/home/dan/mariadb-server-10.4/sql/sys_vars.cc:37:
/export/home/dan/mariadb-server-10.4/sql/sys_vars.ic:69: error: "DEPRECATED" redefined [-Werror]
69 | #define DEPRECATED(X) X
|
In file included from /export/home/dan/mariadb-server-10.4/include/violite.h:150,
from /export/home/dan/mariadb-server-10.4/sql/sql_class.h:38,
from /export/home/dan/mariadb-server-10.4/sql/sys_vars.cc:36:
/usr/include/openssl/ssl.h:2356: note: this is the location of the previous definition
2356 | # define DEPRECATED __attribute__((deprecated))
|
Avoid Werror condition on non-Linux:
plugin/server_audit/server_audit.c:2267:7: error: variable 'db_len_off' set but not used [-Werror=unused-but-set-variable]
2267 | int db_len_off;
| ^~~~~~~~~~
plugin/server_audit/server_audit.c:2266:7: error: variable 'db_off' set but not used [-Werror=unused-but-set-variable]
2266 | int db_off;
| ^~~~~~
auth_gssapi fix include path for Solaris
Consistent with the upstream packaged patch:
https://github.com/OpenIndiana/oi-userland/blob/oi/hipster/components/database/mariadb-103/patches/06-gssapi.h.patch
compile warnings on Solaris
[ 91%] Building C object plugin/server_audit/CMakeFiles/server_audit.dir/server_audit.c.o
/plugin/server_audit/server_audit.c: In function 'auditing_v8':
/plugin/server_audit/server_audit.c:2194:20: error: unused variable 'db_len_off' [-Werror=unused-variable]
2194 | static const int db_len_off= 128;
| ^~~~~~~~~~
/plugin/server_audit/server_audit.c:2193:20: error: unused variable 'db_off' [-Werror=unused-variable]
2193 | static const int db_off= 120;
| ^~~~~~
/plugin/server_audit/server_audit.c:2192:20: error: unused variable 'cmd_off' [-Werror=unused-variable]
2192 | static const int cmd_off= 4432;
| ^~~~~~~
At top level:
/plugin/server_audit/server_audit.c:2192:20: error: 'cmd_off' defined but not used [-Werror=unused-const-variable=]
/plugin/server_audit/server_audit.c:2193:20: error: 'db_off' defined but not used [-Werror=unused-const-variable=]
2193 | static const int db_off= 120;
| ^~~~~~
/plugin/server_audit/server_audit.c:2194:20: error: 'db_len_off' defined but not used [-Werror=unused-const-variable=]
2194 | static const int db_len_off= 128;
| ^~~~~~~~~~
cc1: all warnings being treated as errors
tested on:
$ uname -a
SunOS openindiana 5.11 illumos-b97b1727bc i86pc i386 i86pc
66 lines
2.2 KiB
C
66 lines
2.2 KiB
C
/*
|
|
Copyright (c) 2000, 2010, Oracle and/or its affiliates.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
|
|
|
|
/*
|
|
File to include when we want to use alarm or a loop_counter to display
|
|
some information when a program is running
|
|
*/
|
|
#ifndef _my_alarm_h
|
|
#define _my_alarm_h
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
extern int volatile my_have_got_alarm;
|
|
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 ; \
|
|
alarm_old=(uint) alarm(MY_HOW_OFTEN_TO_ALARM); \
|
|
alarm_signal=signal(SIGALRM,my_set_alarm_variable);
|
|
#define ALARM_END (void) signal(SIGALRM,alarm_signal); \
|
|
(void) alarm(alarm_old);
|
|
#define ALARM_TEST my_have_got_alarm
|
|
#ifdef SIGNAL_HANDLER_RESET_ON_DELIVERY
|
|
#define ALARM_REINIT (void) alarm(MY_HOW_OFTEN_TO_ALARM); \
|
|
(void) signal(SIGALRM,my_set_alarm_variable);\
|
|
my_have_got_alarm=0;
|
|
#else
|
|
#define ALARM_REINIT (void) alarm((uint) MY_HOW_OFTEN_TO_ALARM); \
|
|
my_have_got_alarm=0;
|
|
#endif /* SIGNAL_HANDLER_RESET_ON_DELIVERY */
|
|
#else
|
|
#define ALARM_VARIABLES long alarm_pos=0,alarm_end_pos=MY_HOW_OFTEN_TO_WRITE-1
|
|
#define ALARM_INIT
|
|
#define ALARM_END
|
|
#define ALARM_TEST (alarm_pos++ >= alarm_end_pos)
|
|
#define ALARM_REINIT (alarm_end_pos+=MY_HOW_OFTEN_TO_WRITE)
|
|
#endif /* HAVE_ALARM */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif
|