From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 13 Aug 2002 02:32:57 +0000 (+0000)
Subject: Fix IRIX sc_mask conflict
X-Git-Tag: NO_SLAP_OP_BLOCKS~1230
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c5b6a86502dc0c16027cd87e3d9544e9078083db;p=openldap

Fix IRIX sc_mask conflict
---

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 535345c2e2..53d927004f 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -49,6 +49,8 @@ static SLAP_CTRL_PARSE_FN parseNoOp;
 static SLAP_CTRL_PARSE_FN parsePagedResults;
 static SLAP_CTRL_PARSE_FN parseValuesReturnFilter;
 
+#undef sc_mask /* avoid conflict with Irix 6.5 <sys/signal.h> */
+
 static struct slap_control {
 	char *sc_oid;
 	slap_mask_t sc_mask;