Remove incorrect use of <matched> entry

[openldap] / include / ldap_cdefs.h

diff --git a/include/ldap_cdefs.h b/include/ldap_cdefs.h
index 2f7ed6e987491c61bff4efc498be9356baecb136..c0088a0bca6b6b9a48cb9b60135d01dc59bdcfda 100644 (file)
--- a/include/ldap_cdefs.h
+++ b/include/ldap_cdefs.h
@@ -1,36 +1,71 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms 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.
+ */
 /* LDAP C Defines */
 
 #ifndef _LDAP_CDEFS_H
 #define _LDAP_CDEFS_H
 
-#if defined(__cplusplus)
+#if defined(__cplusplus) || defined(c_plusplus)
 #      define LDAP_BEGIN_DECL  extern "C" {
 #      define LDAP_END_DECL    }
 #else
-#      define LDAP_BEGIN_DECL
-#      define LDAP_END_DECL    
+#      define LDAP_BEGIN_DECL  /* begin declarations */
+#      define LDAP_END_DECL    /* end declarations */
 #endif
 
-#if defined(__STDC__) || defined(__cplusplus)
+#if !defined(__NO_PROTOTYPES) && ( defined(__NEED_PROTOTYPES) || \
+       defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus) )
+
        /* ANSI C or C++ */
 #      define LDAP_P(protos)   protos
 #      define LDAP_CONCAT1(x,y)        x ## y
 #      define LDAP_CONCAT(x,y) LDAP_CONCAT1(x,y)
 #      define LDAP_STRING(x)   #x /* stringify without expanding x */
 #      define LDAP_XSTRING(x)  LDAP_STRING(x) /* expand x, then stringify */
-#else /* ! __STDC__ && ! __cplusplus */
+
+#ifndef LDAP_CONST
+#      define LDAP_CONST       const
+#endif
+
+#else /* no prototypes */
+
        /* traditional C */
 #      define LDAP_P(protos)   ()
 #      define LDAP_CONCAT(x,y) x/**/y
 #      define LDAP_STRING(x)   "x"
-#endif /* __STDC__ || __cplusplus */
 
-#ifndef LDAP_F
-#      ifdef _WIN32
-#              define LDAP_F   __declspec( dllexport )
-#      else /* ! _WIN32 */
-#              define LDAP_F   extern
-#      endif /* _WIN32 */
-#endif /* LDAP_FDECL */
+#ifndef LDAP_CONST
+#      define LDAP_CONST       /* no const */
+#endif
+
+#endif /* no prototypes */
+
+#if _WIN32 && _DLL
+#      define LDAP_F_IMPORT    extern __declspec( dllimport )
+#      define LDAP_F_EXPORT    extern __declspec( dllexport )
+#else
+#      define LDAP_F_IMPORT    extern
+#      define LDAP_F_EXPORT    extern
+#endif
 
 #endif /* _LDAP_CDEFS_H */
+
+/* purposely allow these to be redefined */
+#ifndef LDAP_F_PRE
+#      define LDAP_F_PRE       LDAP_F_IMPORT
+#endif
+#ifndef LDAP_F_POST
+#      define LDAP_F_POST      /* no post */
+#endif
+#ifndef LDAP_F
+#define LDAP_F(type)   LDAP_F_PRE type LDAP_F_POST
+#endif
+