Remove underscores from function declarations.

(__attribute__, __alignof__) [!__GNUC__]: Define.

diff --git a/src/ChangeLog b/src/ChangeLog
index a9165ea39b7984a5917ad8cfa5e336d17bbf161c..5c01438c3b51b03eee8c77770dda2d29895d7fcf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-05  Jason Rumney  <jasonr@gnu.org>
+
+       * md5.h: Remove underscores from function declarations.
+       (__attribute__, __alignof__) [!__GNUC__]: Define.
+
+       * md5.c: Delay include of md5.h until after namespace cleaning.
+
 2000-12-05  Jason Rumney  <jasonr@altavista.net>
 
        * w32term.c (expose_area): Complete last change.

diff --git a/src/md5.h b/src/md5.h
index 78e2dd31b10e7c7a8b2efaccf1664e4705b083cb..697985d561db2d84abf2fd5ba8856220d82591e3 100644 (file)
--- a/src/md5.h
+++ b/src/md5.h
@@ -77,6 +77,11 @@ typedef u_int32_t md5_uint32;
 # define __P(x) ()
 #endif
 
+#ifndef __GNUC__
+#define __attribute__(X)
+#define __alignof__(X) 1
+#endif
+
 /* Structure to save state of computation between the single steps.  */
 struct md5_ctx
 {
@@ -97,20 +102,20 @@ struct md5_ctx
 
 /* Initialize structure containing state of computation.
    (RFC 1321, 3.3: Step 3)  */
-extern void __md5_init_ctx __P ((struct md5_ctx *ctx));
+extern void md5_init_ctx __P ((struct md5_ctx *ctx));
 
 /* Starting with the result of former calls of this function (or the
    initialization function update the context for the next LEN bytes
    starting at BUFFER.
    It is necessary that LEN is a multiple of 64!!! */
-extern void __md5_process_block __P ((const void *buffer, size_t len,
+extern void md5_process_block __P ((const void *buffer, size_t len,
                                      struct md5_ctx *ctx));
 
 /* Starting with the result of former calls of this function (or the
    initialization function update the context for the next LEN bytes
    starting at BUFFER.
    It is NOT required that LEN is a multiple of 64.  */
-extern void __md5_process_bytes __P ((const void *buffer, size_t len,
+extern void md5_process_bytes __P ((const void *buffer, size_t len,
                                      struct md5_ctx *ctx));
 
 /* Process the remaining bytes in the buffer and put result from CTX
@@ -120,7 +125,7 @@ extern void __md5_process_bytes __P ((const void *buffer, size_t len,
 
    IMPORTANT: On some systems it is required that RESBUF is correctly
    aligned for a 32 bits value.  */
-extern void *__md5_finish_ctx __P ((struct md5_ctx *ctx, void *resbuf));
+extern void *md5_finish_ctx __P ((struct md5_ctx *ctx, void *resbuf));
 
 
 /* Put result from CTX in first 16 bytes following RESBUF.  The result is
@@ -129,19 +134,19 @@ extern void *__md5_finish_ctx __P ((struct md5_ctx *ctx, void *resbuf));
 
    IMPORTANT: On some systems it is required that RESBUF is correctly
    aligned for a 32 bits value.  */
-extern void *__md5_read_ctx __P ((const struct md5_ctx *ctx, void *resbuf));
+extern void *md5_read_ctx __P ((const struct md5_ctx *ctx, void *resbuf));
 
 
 /* Compute MD5 message digest for bytes read from STREAM.  The
    resulting message digest number will be written into the 16 bytes
    beginning at RESBLOCK.  */
-extern int __md5_stream __P ((FILE *stream, void *resblock));
+extern int md5_stream __P ((FILE *stream, void *resblock));
 
 /* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
    result is always in little endian byte order, so that a byte-wise
    output yields to the wanted ASCII representation of the message
    digest.  */
-extern void *__md5_buffer __P ((const char *buffer, size_t len,
+extern void *md5_buffer __P ((const char *buffer, size_t len,
                                void *resblock));
 
 #endif /* md5.h */