Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / include / ac / bytes.h

diff --git a/include/ac/bytes.h b/include/ac/bytes.h
index 465a6f71efda3cadfc292075b63490d1015551bd..8917d9dcf0d2bd3c9a832cf87802bbb4f6598127 100644 (file)
--- a/include/ac/bytes.h
+++ b/include/ac/bytes.h
@@ -1,14 +1,17 @@
 /* Generic bytes.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * 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.
+ * 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
@@ -16,7 +19,7 @@
 
 /* cross compilers should define both AC_INT{2,4}_TYPE in CPPFLAGS */
 
-#if !defined( AC_INT4_TYPE ) 
+#if !defined( AC_INT4_TYPE )
        /* use autoconf defines to provide sized typedefs */
 #      if SIZEOF_LONG == 4
 #              define AC_INT4_TYPE long
@@ -25,8 +28,7 @@
 #      elif SIZEOF_SHORT == 4
 #              define AC_INT4_TYPE short
 #      else
-/* used by SHA-1, but commented out */
-/* #   error "AC_INT2_TYPE?" */
+#      error "AC_INT4_TYPE?"
 #      endif
 #endif
 
@@ -34,7 +36,7 @@ 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 !defined( AC_INT2_TYPE )
 #      if SIZEOF_SHORT == 2
 #              define AC_INT2_TYPE short
 #      elif SIZEOF_INT == 2
@@ -42,12 +44,11 @@ typedef unsigned AC_INT4_TYPE ac_uint4;
 #      elif SIZEOF_LONG == 2
 #              define AC_INT2_TYPE long
 #      else
-/* not used, no error */
-/* #   error "AC_INT2_TYPE?" */
+#      error "AC_INT2_TYPE?"
 #      endif
 #endif
-    
-#if defined( AC_INT2_TYPE ) 
+ 
+#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;