Assume ANSI C.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 179d0d2..be7254f 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-20  Bruno Haible  <bruno@clisp.org>
+
+       Assume C89, so PARAMS isn't needed.
+       * unicodeio.h (PARAMS): Remove.
+       * unicodeio.c: Don't use PARAMS.
+
 2003-06-18  Jim Meyering  <jim@meyering.net>
 
        Merge changes from coreutils.

diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index a146569..f31ac52 100644 (file)
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -1,6 +1,6 @@
 /* Unicode character output to streams with locale dependent encoding.
 
-   Copyright (C) 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -112,10 +112,10 @@ utf8_wctomb (unsigned char *r, unsigned int wc)
    Assumes that the locale doesn't change between two calls.  */
 long
 unicode_to_mb (unsigned int code,
-              long (*success) PARAMS ((const char *buf, size_t buflen,
-                                       void *callback_arg)),
-              long (*failure) PARAMS ((unsigned int code, const char *msg,
-                                       void *callback_arg)),
+              long (*success) (const char *buf, size_t buflen,
+                               void *callback_arg),
+              long (*failure) (unsigned int code, const char *msg,
+                               void *callback_arg),
               void *callback_arg)
 {
   static int initialized;

diff --git a/lib/unicodeio.h b/lib/unicodeio.h
index 92fa23c..89f87d5 100644 (file)
--- a/lib/unicodeio.h
+++ b/lib/unicodeio.h
@@ -1,6 +1,6 @@
 /* Unicode character output to streams with locale dependent encoding.
 
-   Copyright (C) 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -23,23 +23,15 @@
 # include <stddef.h>
 # include <stdio.h>
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
 /* Outputs the Unicode character CODE to the output stream STREAM.
    Upon failure, exit if exit_on_error is true, otherwise output a fallback
    notation.  */
-extern void print_unicode_char PARAMS ((FILE *stream, unsigned int code,
-                                       int exit_on_error));
+extern void print_unicode_char (FILE *stream, unsigned int code,
+                                int exit_on_error);
 
 /* Simple success callback that outputs the converted string.
    The STREAM is passed as callback_arg.  */
-extern long fwrite_success_callback PARAMS ((const char *buf, size_t buflen,
-                                            void *callback_arg));
+extern long fwrite_success_callback (const char *buf, size_t buflen,
+                                     void *callback_arg);
 
 #endif