slapd/controls.c: sc_mask conflicts with Irix sys/signal.h (ITS#2022)

[dbroady@lexmark.com]

Full_Name: Darin Broady
Version: 2.1.3
OS: Irix 6.5.15m
URL: 
Submission from: (NULL) (192.146.101.11)


I am trying to compile OpenLDAP 2.1.3 on Irix 6.5.15m with MIPSpro
7.3.1.3m compilers.  Compilation failed on servers/slapd/controls.c
(version 1.30.2.3) because at line 54, the slap_mask_t variable sc_mask
has a redefition to sc_sigset.__sigbits[0] from <sys/signal.h>, which is
implicitly included by <arpa/nameser.h>.

The fix for this is to change the name to something else, or to
#undef sc_mask before declaring the variable.  I would opt for the
renaming of the variable.  I would possibly suggest sctrl_mask, since
it is slap_control_mask.

This doesn't happen on Solaris 8.