Add LDAP_BEGIN/END_DECL

diff --git a/servers/slapd/slapi/slapi.h b/servers/slapd/slapi/slapi.h
index 9ea45c9f5e0f3c6c51eb706b05bd7014b84de11d..4e5ea29addf1cfefc926a98a298835b00db8aded 100644 (file)
--- a/servers/slapd/slapi/slapi.h
+++ b/servers/slapd/slapi/slapi.h
@@ -15,11 +15,15 @@
 
 #include <ibm_pblock_params.h> 
 
+LDAP_BEGIN_DECL
+
 typedef struct slapi_pblock    Slapi_PBlock;
 typedef struct slap_entry      Slapi_Entry;
 typedef struct slap_attr       Slapi_Attr;
 typedef Filter                 Slapi_Filter;
 
+LDAP_END_DECL
+
 #include <slapi_utils.h>
 #ifndef NO_PBLOCK_CLASS
 #include <slapi_pblock.h>
@@ -30,6 +34,8 @@ typedef Filter                        Slapi_Filter;
 #include <slapi_cl.h>
 #endif /* 0 */
 
+LDAP_BEGIN_DECL
+
 /*
  * types of plugins
  */
@@ -294,5 +300,7 @@ typedef Filter                      Slapi_Filter;
 #define SLAPI_OPERATION_ANY                    0xFFFFFFFFL
 #define SLAPI_OPERATION_NONE                   0x00000000L
 
+LDAP_END_DECL
+
 #endif /* _SLAPI_H */
 

diff --git a/servers/slapd/slapi/slapi_common.h b/servers/slapd/slapi/slapi_common.h
index ef7b5c77104d403015a4909e43136112c4567292..a44898f36b8b6381797317e7f59f8fcee5dd6179 100644 (file)
--- a/servers/slapd/slapi/slapi_common.h
+++ b/servers/slapd/slapi/slapi_common.h
@@ -13,6 +13,9 @@
 #ifndef SLAPI_COMMON_H
 #define SLAPI_COMMON_H
 
+LDAP_BEGIN_DECL
+
+
 #ifndef TRUE
 #define TRUE 1
 #endif
@@ -35,5 +38,7 @@ typedef struct strlist {
        struct strlist *next;
 } StrList;
 
+LDAP_END_DECL
+
 #endif /* SLAPI_COMMON_H */
 

diff --git a/servers/slapd/slapi/slapi_ops.h b/servers/slapd/slapi/slapi_ops.h
index 341a351f7609cc9c045af936e0b6d4397da74e01..e6189ffc745c4790d9c9fdb4db25fd72a4972be0 100644 (file)
--- a/servers/slapd/slapi/slapi_ops.h
+++ b/servers/slapd/slapi/slapi_ops.h
@@ -13,6 +13,8 @@
 #ifndef SLAPI_OPS_H
 #define SLAPI_OPS_H
 
+LDAP_BEGIN_DECL
+
 Slapi_PBlock *slapi_search_internal( char *base, int scope, char *filter, 
                LDAPControl **controls, char **attrs, int attrsonly );
 Slapi_PBlock *slapi_search_internal_bind( char *bindDN, char *base,
@@ -38,5 +40,7 @@ Slapi_PBlock *slapi_modrdn_internal( char * olddn, char * newrdn,
 char **slapi_get_supported_extended_ops(void);
 int duplicateBVMod( LDAPMod *pMod, LDAPMod **ppNewMod );
 
+LDAP_END_DECL
+
 #endif /* SLAPI_OPS_H */
 

diff --git a/servers/slapd/slapi/slapi_pblock.h b/servers/slapd/slapi/slapi_pblock.h
index 90a6fdf86fb21685552c4ca02fd281820bc618c3..fb80d88b67a18f4cc4532ee15b3b945c7de24e2b 100644 (file)
--- a/servers/slapd/slapi/slapi_pblock.h
+++ b/servers/slapd/slapi/slapi_pblock.h
@@ -20,6 +20,8 @@
 #define INVALID_PARAM PBLOCK_ERROR
 #define MAX_PARAMS 100
 
+LDAP_BEGIN_DECL
+
 struct slapi_pblock {
        ldap_pvt_thread_mutex_t pblockMutex;
        int                     ckParams;
@@ -42,5 +44,7 @@ void slapi_pblock_clear(Slapi_PBlock *pb);
 int slapi_x_pblock_get_first( Backend *be, Slapi_PBlock **pb );
 int slapi_x_pblock_get_next( Slapi_PBlock **pb );
 
+LDAP_END_DECL
+
 #endif /* SLAPI_PBLOCK_H */
 

diff --git a/servers/slapd/slapi/slapi_utils.h b/servers/slapd/slapi/slapi_utils.h
index 252a4f60dd4aae8ffad98716b631a83c1ba03c2d..35efc525d2f7fd6c2390c345560cc6eba195ea60 100644 (file)
--- a/servers/slapd/slapi/slapi_utils.h
+++ b/servers/slapd/slapi/slapi_utils.h
@@ -13,6 +13,8 @@
 #ifndef _SLAPI_UTILS_H
 #define _SLAPI_UTILS_H
 
+LDAP_BEGIN_DECL
+
 struct _Audit_record;
 typedef struct _Audit_record Audit_record;
 
@@ -118,5 +120,7 @@ extern ldap_pvt_thread_mutex_t      slapi_printmessage_mutex;
 extern char                    *slapi_log_file;
 extern int                     slapi_log_level;
 
+LDAP_END_DECL
+
 #endif /* _SLAPI_UTILS_H */