Sync with HEAD

[openldap] / include / ac / bytes.h

diff --git a/include/ac/bytes.h b/include/ac/bytes.h
index 160f0bbc8e1b729a509909690465f8f31dc8a5ab..bbc9129686168d6f466b692974f7f708fc3de935 100644 (file)
--- a/include/ac/bytes.h
+++ b/include/ac/bytes.h
@@ -1,13 +1,17 @@
 /* Generic bytes.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 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>.
  */
 
 #ifndef _AC_BYTES_H
@@ -15,32 +19,40 @@
 
 /* cross compilers should define both AC_INT{2,4}_TYPE in CPPFLAGS */
 
-#if !defined( AC_INT4_TYPE ) || !defined( AC_INT2_TYPE )
+#if !defined( AC_INT4_TYPE )
        /* use autoconf defines to provide sized typedefs */
 #      if SIZEOF_LONG == 4
 #              define AC_INT4_TYPE long
 #      elif SIZEOF_INT == 4
 #              define AC_INT4_TYPE int
+#      elif SIZEOF_SHORT == 4
+#              define AC_INT4_TYPE short
 #      else
-#              error "AC_INT4_TYPE?"
+#      error "AC_INT4_TYPE?"
 #      endif
+#endif
 
+typedef AC_INT4_TYPE ac_int4;
+typedef signed AC_INT4_TYPE ac_sint4;
+typedef unsigned AC_INT4_TYPE ac_uint4;
+
+#if !defined( AC_INT2_TYPE )
 #      if SIZEOF_SHORT == 2
 #              define AC_INT2_TYPE short
 #      elif SIZEOF_INT == 2
 #              define AC_INT2_TYPE int
+#      elif SIZEOF_LONG == 2
+#              define AC_INT2_TYPE long
 #      else
-#              error "AC_INT2_TYPE?"
+#      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;
-
+ 
+#if defined( AC_INT2_TYPE )
 typedef AC_INT2_TYPE ac_int2;
 typedef signed AC_INT2_TYPE ac_sint2;
 typedef unsigned AC_INT2_TYPE ac_uint2;
+#endif
 
 #ifndef BYTE_ORDER
 /* cross compilers should define BYTE_ORDER in CPPFLAGS */