Genericize byte types into autoconf namespace.

diff --git a/include/ac/bytes.h b/include/ac/bytes.h
index 74265604a3b68670125c97fe0a3d9540b692286b..512ab5496dff899f950794aad738bc6719721947 100644 (file)
--- a/include/ac/bytes.h
+++ b/include/ac/bytes.h
@@ -12,40 +12,35 @@
 #ifndef _AC_BYTES_H
 #define _AC_BYTES_H
 
-#if defined( LDAP_INT4_TYPE ) && defined( LDAP_INT2_TYPE )
-       /* cross compilers should define LDAP_INT{2,4}_TYPE in CPPFLAS */
-       typedef LDAP_INT4_TYPE LDAP_INT4;
-       typedef signed LDAP_INT4_TYPE LDAP_SINT4;
-       typedef unsigned LDAP_INT4_TYPE LDAP_UINT4;
+/* cross compilers should define both AC_INT{2,4}_TYPE in CPPFLAGS */
 
-       typedef LDAP_INT2_TYPE LDAP_INT2;
-       typedef signed LDAP_INT2_TYPE LDAP_SINT2;
-       typedef unsigned LDAP_INT2_TYPE LDAP_UINT2;
-
-#else
+#if !defined( AC_INT4_TYPE ) || !defined( AC_INT2_TYPE )
        /* use autoconf defines to provide sized typedefs */
 #      if SIZEOF_LONG == 4
-               typedef long LDAP_INT4;
-               typedef signed long LDAP_SINT4;
-               typedef unsigned long LDAP_UINT4;
+#              define AC_INT4_TYPE long
 #      elif SIZEOF_INT == 4
-               typedef int LDAP_INT4;
-               typedef signed int LDAP_SINT4;
-               typedef unsigned int LDAP_UINT4;
-
+#              define AC_INT4_TYPE int
+#      else
+#              error "AC_INT4_TYPE?"
 #      endif
 
 #      if SIZEOF_SHORT == 2
-               typedef short LDAP_INT2;
-               typedef signed short LDAP_SINT2;
-               typedef unsigned short LDAP_UINT2;
+#              define AC_INT2_TYPE short
 #      elif SIZEOF_INT == 2
-               typedef int LDAP_INT2;
-               typedef signed int LDAP_SINT2;
-               typedef unsigned int LDAP_UINT2;
+#              define AC_INT2_TYPE int
+#      else
+#              error "AC_INT2_TYPE?"
 #      endif
 #endif
     
+typedef AC_INT4_TYPE ac_int4;
+typedef signed AC_INT4_TYPE ac_sint4;
+typedef unsigned AC_INT4_TYPE ac_uint4;
+
+typedef AC_INT2_TYPE ac_int2;
+typedef signed AC_INT2_TYPE ac_sint2;
+typedef unsigned AC_INT2_TYPE ac_uint2;
+
 #ifndef BYTE_ORDER
 /* cross compilers should define BYTE_ORDER in CPPFLAGS */
 

diff --git a/include/lutil_md5.h b/include/lutil_md5.h
index f3cbbc69cf875748ca41b14ef8de4163533fcb40..bb0293730705166b4999d6302fb30538bf028667 100644 (file)
--- a/include/lutil_md5.h
+++ b/include/lutil_md5.h
@@ -26,7 +26,7 @@ LDAP_BEGIN_DECL
 
 #ifndef LDAP_UINT32
 #define LDAP_UINT32 1
-typedef LDAP_UINT4 uint32;
+typedef ac_uint4 uint32;
 #endif
 
 struct lutil_MD5Context {

diff --git a/include/lutil_sha1.h b/include/lutil_sha1.h
index b51da64e66670eec9a4858fe9980b77316df7aeb..6a23de2a497d45d7c314a364a48af96fc3acb40e 100644 (file)
--- a/include/lutil_sha1.h
+++ b/include/lutil_sha1.h
@@ -22,12 +22,11 @@ LDAP_BEGIN_DECL
 /*
  * SHA-1 in C
  * By Steve Reid <steve@edmweb.com>
- * 100% Public Domain
  */
 
 #ifndef LDAP_UINT32
 #define LDAP_UINT32 1
-typedef LDAP_UINT4 uint32;
+typedef ac_uint4 uint32;
 #endif
 
 typedef struct {