Revert to original code

[openldap] / include / lber_types.h.in

diff --git a/include/lber_types.h.in b/include/lber_types.h.in
index 5f1bb70f39dad10ce5c09a6a610d59c67f9f39ce..cae4a09d72dce3ac5bdd95179dae2b38b9f73a3b 100644 (file)
--- a/include/lber_types.h.in
+++ b/include/lber_types.h.in
@@ -1,11 +1,16 @@
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 /*
@@ -15,16 +20,43 @@
 #ifndef _LBER_TYPES_H
 #define _LBER_TYPES_H
 
-/* LBER boolean, enum, integers - 32 bits or larger*/
+#include <ldap_cdefs.h>
+
+LDAP_BEGIN_DECL
+
+/* LBER boolean, enum, integers (32 bits or larger) */
 #undef LBER_INT_T
 
-/* LBER tags - 32 bits or larger */
+/* LBER tags (32 bits or larger) */
 #undef LBER_TAG_T
 
 /* LBER socket descriptor */
 #undef LBER_SOCKET_T
 
-/* LBER lengths - 32 bits or larger*/
+/* LBER lengths (32 bits or larger) */
 #undef LBER_LEN_T
 
+/* ------------------------------------------------------------ */
+
+/* booleans, enumerations, and integers */
+typedef LBER_INT_T ber_int_t;
+
+/* signed and unsigned versions */
+typedef signed LBER_INT_T ber_sint_t;
+typedef unsigned LBER_INT_T ber_uint_t;
+
+/* tags */
+typedef unsigned LBER_TAG_T ber_tag_t;
+
+/* "socket" descriptors */
+typedef LBER_SOCKET_T ber_socket_t;
+
+/* lengths */
+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 */