From b3705e69f42c957dba455eac0dae45f6e4a72b0c Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 20 Jan 2003 20:16:42 +0000
Subject: [PATCH] Add LDAP_BEGIN/END_DECL

---
 servers/slapd/slapi/slapi.h        | 8 ++++++++
 servers/slapd/slapi/slapi_common.h | 5 +++++
 servers/slapd/slapi/slapi_ops.h    | 4 ++++
 servers/slapd/slapi/slapi_pblock.h | 4 ++++
 servers/slapd/slapi/slapi_utils.h  | 4 ++++
 5 files changed, 25 insertions(+)

diff --git a/servers/slapd/slapi/slapi.h b/servers/slapd/slapi/slapi.h
index 9ea45c9f5e..4e5ea29add 100644
--- 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 ef7b5c7710..a44898f36b 100644
--- 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 341a351f76..e6189ffc74 100644
--- 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 90a6fdf86f..fb80d88b67 100644
--- 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 252a4f60dd..35efc525d2 100644
--- 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 */
 
-- 
2.39.5