Fixup begin/end declaration tags

Assume portable.h has been included
Include ldap_cdefs.h at the top.

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index 7379a9a1bfc9db192762fa5265db5cabd93720f8..a1ccea6f04faa14a5daa01c96ef36eabc7141386 100644 (file)
--- 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;