Fix handling of optional cred

[openldap] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index cc19afa69a8b46b0d3d159cdec30b42091940321..e7581bed8a6fcac58b568fd42d957d638abde70e 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -11,29 +11,8 @@
 #ifndef _LDAP_PORTABLE_H
 #define _LDAP_PORTABLE_H
 
-/* --------------------------------------------------- */
-/* begin of WINNT specific entries */
-
-#if defined(WINNT) || defined(_WIN32)
-
-/* don't suck in all of the win32 api */
-#define WIN32_LEAN_AND_MEAN
-
-/* preprocess out undefined functions */
-#define LOG_DEBUG 0
-#define openlog(a, b)
-#define closelog()
-
-/* define undefined types */
-#define ssize_t signed int
-typedef char * caddr_t;
-
-#endif
-
-/* end of WINNT specific entries */
-/* --------------------------------------------------- */
-
 /* end of preamble */
+
 @TOP@
 
 /* define this if needed to get reentrant functions */
@@ -69,7 +48,7 @@ typedef char * caddr_t;
 /*
        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
 */
 
@@ -81,15 +60,27 @@ typedef char * caddr_t;
        LBER_TAG_T
 */
 
+/* define to character address type */
+#undef caddr_t
+
+/* define to signed size type */
+#undef ssize_t
+
 \f
 /* Leave that blank line there!!  Autoheader needs it. */
 
 @BOTTOM@
+
 /* begin of postamble */
 
-#ifndef __NEED_PROTOTYPES
+#ifdef _WIN32
+       /* don't suck in all of the win32 api */
+#      define WIN32_LEAN_AND_MEAN 1
+#endif
+
+#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