summaryrefslogtreecommitdiff
path: root/databases/mysql4-client/patches/patch-ba
blob: ffbff48a90ddcccb80a7c4c651a3de56662e4a16 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
$NetBSD: patch-ba,v 1.2 2007/05/23 08:11:50 martti Exp $

--- client/mysql.cc.orig	2006-11-03 04:15:47.000000000 +0200
+++ client/mysql.cc	2007-05-23 08:25:23.000000000 +0300
@@ -39,6 +39,9 @@
 #include "my_readline.h"
 #include <signal.h>
 #include <violite.h>
+#ifdef NEEDS_BSTRING_H              // defines bzero()
+#include <bstring.h>
+#endif
 
 #if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H)
 #include <locale.h>
@@ -410,8 +413,13 @@
   if (opt_sigint_ignore)
     signal(SIGINT, SIG_IGN);
   else
-    signal(SIGINT, mysql_end);			// Catch SIGINT to clean up
-  signal(SIGQUIT, mysql_end);			// Catch SIGQUIT to clean up
+#ifdef IRIX5
+#define _MYSQL_END_TYPE (void (*)(...))
+#else
+#define _MYSQL_END_TYPE
+#endif
+	signal(SIGINT, _MYSQL_END_TYPE mysql_end); // Catch SIGINT to clean up
+    signal(SIGQUIT, _MYSQL_END_TYPE mysql_end);  // Catch SIGQUIT to clean up
 
   /*
     Run in interactive mode like the ingres/postgres monitor