More for ITS#5262, -q fixes from HEAD

[openldap] / include / lutil_sha1.h

diff --git a/include/lutil_sha1.h b/include/lutil_sha1.h
index a8d5fac91ca2363a9dece7b59b9e569680907434..57a1369024e5b51a33a788e67257116d90c3f88e 100644 (file)
--- a/include/lutil_sha1.h
+++ b/include/lutil_sha1.h
@@ -1,13 +1,16 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 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>.
  */
 
 /* This version is based on:
@@ -19,7 +22,6 @@
 #include <ldap_cdefs.h>
 #include <ac/bytes.h>
 
-#undef AC_INT4_TYPE
 #ifdef AC_INT4_TYPE
 
 LDAP_BEGIN_DECL
@@ -36,10 +38,10 @@ typedef ac_uint4 uint32;
 
 typedef struct {
     uint32 state[5];
-    uint32 count[2];  
+    uint32 count[2];
     unsigned char buffer[64];
 } lutil_SHA1_CTX;
-  
+
 LDAP_LUTIL_F( void )
 lutil_SHA1Transform
        LDAP_P((uint32 state[5], const unsigned char buffer[64]));