making on AIX v5.2 fails on identifier pcl (ITS#2998)

[openldap@9ewartc.com]

Full_Name: Colin Ewart
Version: 2.2.6
OS: AIX v5.2 ML01 + ML02
URL: ftp://ftp.openldap.org/incoming/
Submission from: (NULL) (192.128.252.68)


make of OL v2.2.6 fails on AIX v5.2 (maintenance levels 01 and 02) using C for
AIX v6. Make complains about identifier pcl already being defined in
/usr/include/sys/pcl.h.

#> ./configure  --prefix=/usr/local --libexecdir=/usr/local/sbin --enable-slapd

--enable-slurpd --enable-dynamic --enable-ldbm=no

#> make depend

#> make

<---snip--->
xlc_r -g -I../../include -I./slapi -I../../include   -I/usr/local/include
-I/usr/local/include/openssl -I/usr/local/include/sasl -I/usr/include
-L/usr/local/lib -L/usr/local/lib/sasl2 -L/usr/lib/ -L/lib -L/usr/ccs/lib   -c
repl.c
"slap.h", line 1532.26: 1506-334 (S) Identifier pcl has already been defined on
line 115 of "/usr/include/sys/pcl.h".

Stop.

Line 115 of /usr/include/sys/pcl.h says:

/*
 * Privilege Control List definition
 */
struct  pcl
{
        unsigned int    pcl_len;
        unsigned int    pcl_mode;
        priv_t  pcl_default;
        struct  pcl_entry       pcl_ext[1];
};

I found an ugly hack of renaming "pcl" and "be_pcl_mutex" in slap.h to "pcl_foo"
and "be_pcl_foo_mutex" (and subsequent files) and the make finished
successfully. make test finishes all tests successfully also. What else I have
broken in the hack I've no idea ;-)

Cheers,

Colin