X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=acconfig.h;h=865c099294891c7694a0adfb8f6c2b322e834ae5;hb=0d3d7e71b6b7aa3cdef01ac54b5fa1b51e56af4f;hp=7e6de552ee56a997024557d8040d23011c196a6d;hpb=b64a425755e42c52c880989820419ff4225cbe1e;p=openldap

diff --git a/acconfig.h b/acconfig.h
index 7e6de552ee..865c099294 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,12 +1,15 @@
-/*
- * Copyright 1998-2000 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, 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.
+ * 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
@@ -77,8 +80,6 @@
 #ifdef _WIN32
 	/* don't suck in all of the win32 api */
 #	define WIN32_LEAN_AND_MEAN 1
-
-#	define sleep _sleep
 #endif
 
 #ifndef LDAP_NEEDS_PROTOTYPES
@@ -86,20 +87,38 @@
 #define LDAP_NEEDS_PROTOTYPES 1
 #endif
 
-#ifdef HAVE_STDDEF_H
-#	include <stddef.h>
+#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 */