From c32dcd63659d3fb68b6d0e64f9a9a5331787def7 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 27 Jan 1999 21:11:55 +0000
Subject: [PATCH] Fixup begin/end declaration tags Assume portable.h has been
 included Include ldap_cdefs.h at the top.

---
 include/ldap_pvt_thread.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index 7379a9a1bf..a1ccea6f04 100644
--- a/include/ldap_pvt_thread.h
+++ b/include/ldap_pvt_thread.h
@@ -12,7 +12,7 @@
 #ifndef _LDAP_PVT_THREAD_H
 #define _LDAP_PVT_THREAD_H
 
-#include "portable.h"
+#include "ldap_cdefs.h"
 
 #if defined( HAVE_PTHREADS )
 /**********************************
@@ -133,6 +133,8 @@ LDAP_END_DECL
 #include <windows.h>
 #include <process.h>
 
+LDAP_BEGIN_DECL
+
 typedef HANDLE			ldap_pvt_thread_t;
 typedef int			ldap_pvt_thread_attr_t;
 typedef HANDLE			ldap_pvt_thread_mutex_t;
@@ -143,6 +145,8 @@ typedef int			ldap_pvt_thread_condattr_t;
 #define LDAP_PVT_THREAD_CREATE_DETACHED 0
 #define LDAP_PVT_THREAD_CREATE_JOINABLE 0
 
+LDAP_END_DECL
+
 #else
 
 /***********************************
@@ -176,6 +180,8 @@ LDAP_END_DECL
 #	define HAVE_THREADS 1
 #endif
 
+LDAP_BEGIN_DECL
+
 LDAP_F int 
 ldap_pvt_thread_create LDAP_P(( ldap_pvt_thread_t * thread, 
 			       ldap_pvt_thread_attr_t *attr,
@@ -232,8 +238,6 @@ ldap_pvt_thread_mutex_lock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 LDAP_F int 
 ldap_pvt_thread_mutex_unlock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
 
-#include <ldap_cdefs.h>
-
 typedef struct ldap_pvt_thread_rdwr_var {
 	int readers_reading;
 	int writer_writing;
-- 
2.39.5