Update copyright (including with or without modification clarification)

[openldap] / include / lber_types.h.in

diff --git a/include/lber_types.h.in b/include/lber_types.h.in
index 64adffbda57b52865a9768c8c7318c88dd332550..dd2bc4134c96d30b333f743d4e4621c1aa534be7 100644 (file)
--- a/include/lber_types.h.in
+++ b/include/lber_types.h.in
@@ -1,12 +1,13 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
  * 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 at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
  */
 
 /*
@@ -16,6 +17,10 @@
 #ifndef _LBER_TYPES_H
 #define _LBER_TYPES_H
 
+#include <ldap_cdefs.h>
+
+LDAP_BEGIN_DECL
+
 /* LBER boolean, enum, integers (32 bits or larger) */
 #undef LBER_INT_T
 
@@ -28,4 +33,27 @@
 /* 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 */