ITS#4010 for prev commit, fix slapindex etc. as well.

[openldap] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index 3e291726c3117c910920b9265c7eea9ac8a0d3fc..865c099294891c7694a0adfb8f6c2b322e834ae5 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,18 +1,22 @@
-/* $Id */
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation
  * 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 in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _LDAP_PORTABLE_H
 #define _LDAP_PORTABLE_H
 
 /* end of preamble */
+
 @TOP@
 
 /* define this if needed to get reentrant functions */
@@ -48,7 +52,7 @@
 /*
        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
 */
 
@@ -60,31 +64,61 @@
        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
-/* force LDAP_P to always include prototypes */
-#define __NEED_PROTOTYPES 1
+#ifdef _WIN32
+       /* don't suck in all of the win32 api */
+#      define WIN32_LEAN_AND_MEAN 1
 #endif
 
-#ifdef HAVE_STDDEF_H
-#      include <stddef.h>
+#ifndef LDAP_NEEDS_PROTOTYPES
+/* force LDAP_P to always include prototypes */
+#define LDAP_NEEDS_PROTOTYPES 1
 #endif
 
+#ifndef LDAP_REL_ENG
+#if (LDAP_VENDOR_VERSION == 000000) && !defined(LDAP_DEVEL)
+#define LDAP_DEVEL
+#endif
 #if defined(LDAP_DEVEL) && !defined(LDAP_TEST)
 #define LDAP_TEST
 #endif
-#if defined(LDAP_TEST) && !defined(LDAP_DEBUG)
-#define LDAP_DEBUG
 #endif
 
+#ifdef HAVE_STDDEF_H
+#      include <stddef.h>
+#endif
+
+#ifdef HAVE_EBCDIC 
+/* ASCII/EBCDIC converting replacements for stdio funcs
+ * vsnprintf and snprintf are used too, but they are already
+ * checked by the configure script
+ */
+#define fputs ber_pvt_fputs
+#define fgets ber_pvt_fgets
+#define printf ber_pvt_printf
+#define fprintf ber_pvt_fprintf
+#define vfprintf ber_pvt_vfprintf
+#define vsprintf ber_pvt_vsprintf
+#endif
+
+#include "ac/fdset.h"
+
 #include "ldap_cdefs.h"
 #include "ldap_features.h"
 
 #include "ac/assert.h"
+#include "ac/localize.h"
 
 #endif /* _LDAP_PORTABLE_H */