No anonymous unions.

diff --git a/clients/mail500/main.c b/clients/mail500/main.c
index f7a9993035de4e912e97bd8a8a64f87d6a3fff57..dfc868ddb720dd3ece8ccba3fa048be49a265547 100644 (file)
--- a/clients/mail500/main.c
+++ b/clients/mail500/main.c
@@ -81,7 +81,7 @@ typedef struct errs {
 #define        E_NOOWNER               11
 #define E_GROUPUNKNOWN         12
        char            *e_addr;
-       union {
+       union e_union_u {
                char            *e_u_loop;
                LDAPMessage     *e_u_msg;
        } e_union;

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index a3e37e1f49b4106789ba7dffe5cd5dedc35646df..cf3aee05c025adaa87bfcf6c895f4ed817b133f1 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -306,7 +306,7 @@ modify_dn (LDAP * ld, char *targetdn, char *pwattr, char *oldpw,
 
        strvals[0] = buf;
        strvals[1] = NULL;
-       mod.mod_vals.modv_strvals = strvals;
+       mod.mod_values = strvals;
        mod.mod_type = pwattr;
        mod.mod_op = LDAP_MOD_REPLACE;
        mods[0] = &mod;

diff --git a/libraries/liblutil/sha1.c b/libraries/liblutil/sha1.c
index a0df8ac95b2a0aca78d819f3c783a312883f5c2e..d68d0ce959e48c3bcef351568468ea750b229f0c 100644 (file)
--- a/libraries/liblutil/sha1.c
+++ b/libraries/liblutil/sha1.c
@@ -61,7 +61,7 @@ void
 lutil_SHA1Transform( uint32 *state, const unsigned char *buffer )
 {
     uint32 a, b, c, d, e;
-    typedef union {
+    typedef union char64long16_u {
        unsigned char c[64];
        u_int l[16];
     } CHAR64LONG16;

diff --git a/servers/slapd/shell-backends/shellutil.h b/servers/slapd/shell-backends/shellutil.h
index 7f51500d35844ba2b28415dc60502a4d5e8ee05f..119689d5fbdd226256c023d984b6ce60a681e138 100644 (file)
--- a/servers/slapd/shell-backends/shellutil.h
+++ b/servers/slapd/shell-backends/shellutil.h
@@ -55,7 +55,7 @@ struct ldop {
 #define LDOP_SEARCH    0x01
     char       **ldop_suffixes;
     char       *ldop_dn;
-    union {
+    union ldapop_params_u {
                    struct ldsrchparms LDsrchparams;
          }     ldop_params;
 #define ldop_srch      ldop_params.LDsrchparams

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 0f5eec9e275b33f863d759a83df0382a66266fb1..57a955b49d7c9bcf6616a4650c54b46d069738c0 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -79,7 +79,7 @@ typedef struct ava {
 typedef struct filter {
        unsigned long   f_choice;       /* values taken from ldap.h */
 
-       union {
+       union f_un_u {
                /* present */
                char            *f_un_type;