From: Timo Sirainen <tss@iki.fi>
Date: Mon, 6 Apr 2009 21:15:37 +0000 (-0400)
Subject: Compile fix to NetBSD: Don't use si_code which is a macro.
X-Git-Tag: 2.0.alpha1~1021
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18c8a17e9cb8109b1aa3601cdb3b3fbb36adc79f;p=thirdparty%2Fdovecot%2Fcore.git

Compile fix to NetBSD: Don't use si_code which is a macro.
Patch by Tatsuyoshi.

--HG--
branch : HEAD
---

diff --git a/src/lib/lib-signals.c b/src/lib/lib-signals.c
index e96cb9b39f..9ab5e8d208 100644
--- a/src/lib/lib-signals.c
+++ b/src/lib/lib-signals.c
@@ -27,10 +27,10 @@ static int sig_pipe_fd[2] = { -1, -1 };
 static bool signals_initialized = FALSE;
 static struct io *io_sig = NULL;
 
-const char *lib_signal_code_to_str(int signo, int si_code)
+const char *lib_signal_code_to_str(int signo, int sicode)
 {
 	/* common */
-	switch (si_code) {
+	switch (sicode) {
 	case SI_USER:
 		return "kill";
 #ifdef SI_KERNEL
@@ -43,7 +43,7 @@ const char *lib_signal_code_to_str(int signo, int si_code)
 
 	switch (signo) {
 	case SIGSEGV:
-		switch (si_code) {
+		switch (sicode) {
 		case SEGV_MAPERR:
 			return "address not mapped";
 		case SEGV_ACCERR:
@@ -51,7 +51,7 @@ const char *lib_signal_code_to_str(int signo, int si_code)
 		}
 		break;
 	case SIGBUS:
-		switch (si_code) {
+		switch (sicode) {
 		case BUS_ADRALN:
 			return "invalid address alignment";
 		case BUS_ADRERR:
@@ -60,7 +60,7 @@ const char *lib_signal_code_to_str(int signo, int si_code)
 			return "object-specific hardware error";
 		}
 	}
-	return t_strdup_printf("unknown %d", si_code);
+	return t_strdup_printf("unknown %d", sicode);
 }
 
 static void sig_handler(int signo, siginfo_t *si, void *context ATTR_UNUSED)
diff --git a/src/lib/lib-signals.h b/src/lib/lib-signals.h
index 273d7b8ed4..6da0c7de29 100644
--- a/src/lib/lib-signals.h
+++ b/src/lib/lib-signals.h
@@ -6,7 +6,7 @@
 typedef void signal_handler_t(const siginfo_t *si, void *context);
 
 /* Convert si_code to string */
-const char *lib_signal_code_to_str(int signo, int si_code);
+const char *lib_signal_code_to_str(int signo, int sicode);
 
 /* Set signal handler for specific signal. If delayed is TRUE, the handler
    will be called later, ie. not as a real signal handler. */