X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flber_types.nt;h=4dfbecf510489eb56c5c980d32219bea5bf7c74c;hb=f72dbc212fb1621896af98592567f87f003a3a72;hp=6e26c6771fc8a4f35a23be1362df509e4f50ce85;hpb=0211b35d8d058cac1fa08e42d8780116b5c73bfa;p=openldap

diff --git a/include/lber_types.nt b/include/lber_types.nt
index 6e26c6771f..4dfbecf510 100644
--- a/include/lber_types.nt
+++ b/include/lber_types.nt
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -9,18 +10,23 @@
  */
 
 /*
- * LBER types for Windows NT
+ * LBER types for Windows NT (and Win32)
+ * copied by setup.mak to lber_types.h (when confingure is not used).
  */
 
-#ifndef _LBER_TYPES_H_NT
-#define _LBER_TYPES_H_NT
+#ifndef _LBER_TYPES_H
+#define _LBER_TYPES_H
+
+#include <ldap_cdefs.h>
+
+LDAP_BEGIN_DECL
 
 /*
  * NT types:
  *
  *	bitsof(short) == 2
  *	bitsof(int)	== 4
- *	bitsof(long) == 4
+ *	bitsof(long) == 4	(or larger)
  *
  *  typedef unsigned int size_t;
  *	typedef unsigned int SOCKET;
@@ -38,6 +44,29 @@
 #define LBER_SOCKET_T	unsigned int
 
 /* LBER lengths - 32 bits or larger*/
-#define LBER_LEN_T		int
+#define LBER_LEN_T		long
+
+/* ------------------------------------------------------------ */
+
+/* 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_NT */
+#endif /* _LBER_TYPES_H */