summaryrefslogtreecommitdiff
path: root/libmysql/client_settings.h
diff options
context:
space:
mode:
authorunknown <jani@ua141d10.elisa.omakaista.fi>2005-02-17 23:00:48 +0200
committerunknown <jani@ua141d10.elisa.omakaista.fi>2005-02-17 23:00:48 +0200
commitb1e6157d108a25c8c6cd66298d7a66d0949c08c0 (patch)
treee8aa76185377b7ff3fe22bc79f184a97bc886222 /libmysql/client_settings.h
parentc36f737d54dfe4fac9870b3a7d50b8ba9f4d5147 (diff)
downloadmariadb-git-b1e6157d108a25c8c6cd66298d7a66d0949c08c0.tar.gz
Fixed Bug#7838, "pipe_sig_handler should be static".
Diffstat (limited to 'libmysql/client_settings.h')
-rw-r--r--libmysql/client_settings.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h
index 375e75919a4..e0f093aa7c9 100644
--- a/libmysql/client_settings.h
+++ b/libmysql/client_settings.h
@@ -21,7 +21,7 @@ extern my_string mysql_unix_port;
CLIENT_TRANSACTIONS | \
CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION)
-sig_handler pipe_sig_handler(int sig);
+sig_handler my_pipe_sig_handler(int sig);
void read_user_name(char *name);
my_bool handle_local_infile(MYSQL *mysql, const char *net_filename);
@@ -32,7 +32,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename);
#if !defined(__WIN__) && defined(SIGPIPE) && !defined(THREAD)
#define init_sigpipe_variables sig_return old_signal_handler=(sig_return) 0;
-#define set_sigpipe(mysql) if ((mysql)->client_flag & CLIENT_IGNORE_SIGPIPE) old_signal_handler=signal(SIGPIPE,pipe_sig_handler)
+#define set_sigpipe(mysql) if ((mysql)->client_flag & CLIENT_IGNORE_SIGPIPE) old_signal_handler=signal(SIGPIPE, my_pipe_sig_handler)
#define reset_sigpipe(mysql) if ((mysql)->client_flag & CLIENT_IGNORE_SIGPIPE) signal(SIGPIPE,old_signal_handler);
#else
#define init_sigpipe_variables