X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=acconfig.h;h=865c099294891c7694a0adfb8f6c2b322e834ae5;hb=d602831acd79592518fb94043500f5d646067b25;hp=cdd82b766f420780659e68f120412457b4c2d0c8;hpb=f54de4360b29746147924011d0258df99ec5dfb3;p=openldap

diff --git a/acconfig.h b/acconfig.h
index cdd82b766f..865c099294 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,12 +1,15 @@
-/*
- * Copyright 1998-2002 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
@@ -84,15 +87,17 @@
 #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 
@@ -100,17 +105,20 @@
  * vsnprintf and snprintf are used too, but they are already
  * checked by the configure script
  */
-#define fputs lutil_fputs
-#define fgets lutil_fgets
-#define printf lutil_printf
-#define fprintf lutil_fprintf
-#define vfprintf lutil_vfprintf
-#define vsprintf lutil_vsprintf
+#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 */