more cleanup

[openldap] / include / ldap_cdefs.h

diff --git a/include/ldap_cdefs.h b/include/ldap_cdefs.h
index e6cc1c67576c22272f83eb9209e3ac6f5591d025..265dbcfb2606c7a5cd2cfb7be11613f26fec91b4 100644 (file)
--- a/include/ldap_cdefs.h
+++ b/include/ldap_cdefs.h
@@ -1,13 +1,16 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2001 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 /* LDAP C Defines */
 
@@ -155,13 +158,9 @@
 #endif
 
 /* LDBM library */
-#if defined(_WIN32) && defined(SLAPD_IMPORT)
-#      define LDAP_LDBM_F(type)        extern __declspec(dllimport) type
-#      define LDAP_LDBM_V(type)        extern __declspec(dllimport) type
-#else
+/* Not exported/imported any more */
 #      define LDAP_LDBM_F(type)        extern type
 #      define LDAP_LDBM_V(type)        extern type
-#endif
 
 /* LDIF library */
 #if defined(_WIN32) && defined(SLAPD_IMPORT)
@@ -208,6 +207,24 @@
 #      define LDAP_SLAPD_V(type)       extern type
 #endif
 
+/* SLAPD (as a dynamic library exporting symbols) */
+#if defined(_WIN32) && defined(SLAPD_IMPORT)
+#      define LDAP_SLAPI_F(type)       extern __declspec(dllimport) type
+#      define LDAP_SLAPI_V(type)       extern __declspec(dllimport) type
+#else
+#      define LDAP_SLAPI_F(type)       extern type
+#      define LDAP_SLAPI_V(type)       extern type
+#endif
+
+/* SLAPD (as a dynamic library exporting symbols) */
+#if defined(_WIN32) && defined(SLAPD_IMPORT)
+#      define SLAPI_F(type)            extern __declspec(dllimport) type
+#      define SLAPI_V(type)            extern __declspec(dllimport) type
+#else
+#      define SLAPI_F(type)            extern type
+#      define SLAPI_V(type)            extern type
+#endif
+
 /*
  * C library. Mingw32 links with the dynamic C run-time library by default,
  * so the explicit definition of CSTATIC will keep dllimport from