Prepare for unifdef -DSLAPD_SCHEMA_NOT_COMPAT

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index dff429ded9a358e068cdca3db1ba3814cb09020b..655ce17341bafbd9d2782876c83b3966ee7d3fe8 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -119,7 +119,6 @@ attr_normalize( char *s )
 
        return( ldap_pvt_str2lower( s ) );
 }
-#endif
 
 /*
  * attr_merge_fast - merge the given type and value with the list of
@@ -129,9 +128,6 @@ attr_normalize( char *s )
  *             -1      trouble
  */
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-       /* not used */
-#else
 int
 attr_merge_fast(
     Entry              *e,

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index 4b4ecc3bd8134ead40686440fb427242577b8fbe..9626bab2a8da9ac0549f0008d7b10a38f5e262de 100644 (file)
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -51,9 +51,7 @@ value_add(
        return LDAP_SUCCESS;
 }
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-       /* not used */
-#else
+#ifndef SLAPD_SCHEMA_NOT_COMPAT
 int
 value_add_fast( 
     struct berval      ***vals,