From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 6 Jun 2000 04:49:19 +0000 (+0000)
Subject: Prepare for unifdef -DSLAPD_SCHEMA_NOT_COMPAT
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2742
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3e9868b4ecd46d162dfef6bc428597fe5373f685;p=openldap

Prepare for unifdef -DSLAPD_SCHEMA_NOT_COMPAT
---

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index dff429ded9..655ce17341 100644
--- 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 4b4ecc3bd8..9626bab2a8 100644
--- 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,