Support use of short as LDAP_INT4. #error if LDAP_INT4 not set.

diff --git a/CHANGES b/CHANGES
index d4ac3080c37cab5dd12d5afc50f934d34feee150..de50c30f5a5e0bea414a9519966fb330f0fa86a3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,8 @@ Changes included in OpenLDAP 1.2 Release Engineering
        Added TCP_NODELAY support
        Change slapd to apply ACL to lastmod attributes
        Change slapd.conf default referral
+       Build Environment
+               Support using short as LDAP_INT4
        Documentation
                Reference Quick Start Guide in README and INSTALL
                ldappasswd(1) fix -c vs -H typo (ITS#154)

diff --git a/include/ac/bytes.h b/include/ac/bytes.h
index 74265604a3b68670125c97fe0a3d9540b692286b..b4b674a04dde5de0c8ccc73fb3acd29ee7b06b95 100644 (file)
--- a/include/ac/bytes.h
+++ b/include/ac/bytes.h
@@ -33,16 +33,33 @@
                typedef signed int LDAP_SINT4;
                typedef unsigned int LDAP_UINT4;
 
+#      elif SIZEOF_SHORT == 4
+               typedef short LDAP_INT4;
+               typedef signed short LDAP_SINT4;
+               typedef unsigned short LDAP_UINT4;
+
+#      else
+#              error "No 4 byte integer type!"
 #      endif
 
 #      if SIZEOF_SHORT == 2
                typedef short LDAP_INT2;
                typedef signed short LDAP_SINT2;
                typedef unsigned short LDAP_UINT2;
+
 #      elif SIZEOF_INT == 2
                typedef int LDAP_INT2;
                typedef signed int LDAP_SINT2;
                typedef unsigned int LDAP_UINT2;
+
+#      elif SIZEOF_LONG == 2
+               typedef long LDAP_INT2;
+               typedef signed long LDAP_SINT2;
+               typedef unsigned long LDAP_UINT2;
+
+#      else
+/* not in use, no error */
+/* #           error "No 2 byte integer type!" */
 #      endif
 #endif