From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 16 Aug 2002 18:55:15 +0000 (+0000)
Subject: #undef sc_mask
X-Git-Tag: OPENLDAP_REL_ENG_2_1_4~28
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fd7b0d65da71e1b2258eecaf20fc1384957df778;p=openldap

#undef sc_mask
---

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;