X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fldap_cdefs.h;h=d759d6b11c121cc5fbeb34abce81bca5126bc818;hb=98c6d5259374c98582f9c426781a9b1856d0ac59;hp=926b58091de2a5aee4d32e0b9b6fad18a1f09d32;hpb=c38027902a17d6bd354074136ac1af4ecff38e4e;p=openldap
diff --git a/include/ldap_cdefs.h b/include/ldap_cdefs.h
index 926b58091d..d759d6b11c 100644
--- 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 .
+ *
+ * Copyright 1998-2011 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
+ * .
*/
/* 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