Misc. DN fixes and cleanups, namely don't muck with AVA_BINARY values

[openldap] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index 5af06e90a52c55aa820277be64b73c2065e4098b..069921ee227a9759dde02f448bfd59194588c6d8 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,11 +1,12 @@
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.  A copy of this license is available at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
  */
 
 #ifndef _LDAP_PORTABLE_H
@@ -13,11 +14,6 @@
 
 /* end of preamble */
 
-#if !defined(SLAPD_SCHEMA_COMPAT) && !defined(SLAPD_SCHEMA_NOT_COMPAT)
-       /* define SLAPD_SCHEMA_COMPAT if you want old schema codes */
-#define SLAPD_SCHEMA_NOT_COMPAT 1
-#endif
-
 @TOP@
 
 /* define this if needed to get reentrant functions */
@@ -53,7 +49,6 @@
 /*
        LDAP_API_FEATURE_X_OPENLDAP_REENTRANT
        LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
-       LDAP_API_FEATURE_X_OPENLDAP_V2_DNS
        LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
        LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
 */
@@ -84,9 +79,9 @@
 #      define WIN32_LEAN_AND_MEAN 1
 #endif
 
-#ifndef __NEED_PROTOTYPES
+#ifndef LDAP_NEEDS_PROTOTYPES
 /* force LDAP_P to always include prototypes */
-#define __NEED_PROTOTYPES 1
+#define LDAP_NEEDS_PROTOTYPES 1
 #endif
 
 #ifdef HAVE_STDDEF_H