Merged in changes from CVS trunk. Plus added lisp/term tweaks.

[gnu-emacs] / src / md5.c

diff --git a/src/md5.c b/src/md5.c
index ea6dfc9cc03e7501f6a4bcec21286e899279f792..4f055447eac75491336d6c5a97ca7cf14acb358d 100644 (file)
--- a/src/md5.c
+++ b/src/md5.c
@@ -1,6 +1,7 @@
 /* Functions to compute MD5 message digest of files or memory blocks.
    according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
    This file is part of the GNU Emacs.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -15,8 +16,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 
@@ -38,7 +39,7 @@
 #ifdef _LIBC
 # include <endian.h>
 # if __BYTE_ORDER == __BIG_ENDIAN
-#  define WORDS_BIGENDIAN 1
+#  define WORDS_BIG_ENDIAN 1
 # endif
 /* We need to keep the namespace clean so define the MD5 function
    protected using leading __ .  */
@@ -53,7 +54,7 @@
 
 #include "md5.h"
 
-#ifdef WORDS_BIGENDIAN
+#ifdef WORDS_BIG_ENDIAN
 # define SWAP(n)                                                       \
     (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
 #else
@@ -217,7 +218,7 @@ md5_process_bytes (buffer, len, ctx)
      size_t len;
      struct md5_ctx *ctx;
 {
-  //const void aligned_buffer = buffer;
+  /* const void aligned_buffer = buffer; */
 
   /* When we already have some bits in our internal buffer concatenate
      both inputs first.  */
@@ -441,3 +442,6 @@ md5_process_block (buffer, len, ctx)
   ctx->C = C;
   ctx->D = D;
 }
+
+/* arch-tag: 60084f04-b434-42cb-9d2b-e91df01f4325
+   (do not change this comment) */