X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=acconfig.h;h=7da3594d4c1d3586674d11112f4ea62d75d5e964;hb=0845c0bf6f38fe46e5ac70f2d0b73171091faa80;hp=cc19afa69a8b46b0d3d159cdec30b42091940321;hpb=4cc712db5378592205e4113f6e73da9bfd189ecc;p=openldap

diff --git a/acconfig.h b/acconfig.h
index cc19afa69a..7da3594d4c 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,39 +1,19 @@
 /*
- * 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
- * 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
 #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 +49,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 +61,27 @@ typedef char * caddr_t;
 	LBER_TAG_T
 */
 
+/* define to character address type */
+#undef caddr_t
+
+/* define to signed size type */
+#undef ssize_t
+
 
 /* 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