Cleanup BEGIN/END DECL

diff --git a/include/lber_types.h.in b/include/lber_types.h.in
index 218202e685fbeec5f47abff3d5646cce659be5fe..6595afc15ff4bcf936d309645eee7026d7dc7ef4 100644 (file)
--- a/include/lber_types.h.in
+++ b/include/lber_types.h.in
@@ -9,8 +9,6 @@
  * in file LICENSE in the top-level directory of the distribution.
  */
 
-#include <ldap_cdefs.h>
-
 /*
  * LBER types
  */
@@ -18,6 +16,8 @@
 #ifndef _LBER_TYPES_H
 #define _LBER_TYPES_H
 
+#include <ldap_cdefs.h>
+
 LDAP_BEGIN_DECL
 
 /* LBER boolean, enum, integers (32 bits or larger) */

diff --git a/include/lber_types.nt b/include/lber_types.nt
index a0447cf09c19204a700e5b92454792de20c3debc..26478ac6159b21461aee2207144de40b10bab0fc 100644 (file)
--- a/include/lber_types.nt
+++ b/include/lber_types.nt
@@ -17,6 +17,10 @@
 #ifndef _LBER_TYPES_H
 #define _LBER_TYPES_H
 
+#include <ldap_cdefs.h>
+
+LDAP_BEGIN_DECL
+
 /*
  * NT types:
  *
@@ -63,4 +67,6 @@ typedef unsigned LBER_LEN_T ber_len_t;
 /* signed lengths */
 typedef signed LBER_LEN_T ber_slen_t;
 
+LDAP_END_DECL
+
 #endif /* _LBER_TYPES_H */