X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap_cdefs.h;h=265dbcfb2606c7a5cd2cfb7be11613f26fec91b4;hb=8c3e9ddb1cb2f1f23ef9af3f4cd398f8d284e9f2;hp=e6cc1c67576c22272f83eb9209e3ac6f5591d025;hpb=0552b1c53fa44790811f44cac5e14fc52fbd2ace;p=openldap
diff --git a/include/ldap_cdefs.h b/include/ldap_cdefs.h
index e6cc1c6757..265dbcfb26 100644
--- 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 .
+ *
+ * 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
+ * .
*/
/* 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