Merge remote-tracking branch 'origin/mdb.master'

[openldap] / include / ldap_cdefs.h

diff --git a/include/ldap_cdefs.h b/include/ldap_cdefs.h
index 926b58091de2a5aee4d32e0b9b6fad18a1f09d32..fcb91c815cc2e701e99a4bed4fae3199186d49ef 100644 (file)
--- a/include/ldap_cdefs.h
+++ b/include/ldap_cdefs.h
@@ -1,13 +1,16 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ * 
+ * Copyright 1998-2012 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 */
 
@@ -154,15 +157,6 @@
 #      define LDAP_AVL_V(type)         extern type
 #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
-#      define LDAP_LDBM_F(type)        extern type
-#      define LDAP_LDBM_V(type)        extern type
-#endif
-
 /* LDIF library */
 #if defined(_WIN32) && defined(SLAPD_IMPORT)
 #      define LDAP_LDIF_F(type)        extern __declspec(dllimport) type
@@ -208,6 +202,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