From 2a0621b9495e51d093141dc35e2e176d608df79f Mon Sep 17 00:00:00 2001
From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
Date: Mon, 16 Jun 2003 18:24:08 +0000
Subject: [PATCH] scan.h: Convert to ISO C.
* scan.h: Convert to ISO C.
* system.h: Likewise.
From-SVN: r68027
---
gcc/ChangeLog | 3 +++
gcc/scan.h | 34 +++++++++++++---------------------
gcc/system.h | 48 ++++++++++++++++++++----------------------------
3 files changed, 36 insertions(+), 49 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 835ff43689bf..09979e757ca4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
2003-06-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+ * scan.h: Convert to ISO C.
+ * system.h: Likewise.
+
* c-format.c (dynamic_format_types): New pointer for dynamic data.
(find_length_info_modifier_index, init_dynamic_asm_fprintf_info):
New functions split out of...
diff --git a/gcc/scan.h b/gcc/scan.h
index 49ca823af3b1..7062cdaf90ed 100644
--- a/gcc/scan.h
+++ b/gcc/scan.h
@@ -33,14 +33,6 @@ typedef struct sstring
#define MAKE_SSTRING_SPACE(STR, COUNT) \
if ((STR)->limit - (STR)->ptr < (COUNT)) make_sstring_space (STR, COUNT);
-#ifndef _PARAMS
-#if defined(ANSI_PROTOTYPES) || defined(__cplusplus)
-#define _PARAMS(args) args
-#else
-#define _PARAMS(args) ()
-#endif
-#endif
-
struct partial_proto;
struct fn_decl
{
@@ -52,26 +44,26 @@ struct fn_decl
struct cpp_token;
-extern void sstring_append _PARAMS((sstring *, sstring *));
-extern void make_sstring_space _PARAMS((sstring *, int));
-extern int skip_spaces _PARAMS((FILE *, int));
-extern int scan_ident _PARAMS((FILE *, sstring *, int));
-extern int scan_string _PARAMS((FILE *, sstring *, int));
-extern int read_upto _PARAMS((FILE *, sstring *, int));
-extern unsigned long hash _PARAMS((const char *));
-extern void recognized_function _PARAMS((const struct cpp_token *,
- unsigned int, int, int));
-extern void recognized_extern _PARAMS((const struct cpp_token *));
-extern unsigned int hashstr _PARAMS((const char *, unsigned int));
+extern void sstring_append (sstring *, sstring *);
+extern void make_sstring_space (sstring *, int);
+extern int skip_spaces (FILE *, int);
+extern int scan_ident (FILE *, sstring *, int);
+extern int scan_string (FILE *, sstring *, int);
+extern int read_upto (FILE *, sstring *, int);
+extern unsigned long hash (const char *);
+extern void recognized_function (const struct cpp_token *,
+ unsigned int, int, int);
+extern void recognized_extern (const struct cpp_token *);
+extern unsigned int hashstr (const char *, unsigned int);
-extern int scan_decls _PARAMS((struct cpp_reader *, int, char **));
+extern int scan_decls (struct cpp_reader *, int, char **);
/* get_token is a simple C lexer. */
#define IDENTIFIER_TOKEN 300
#define CHAR_TOKEN 301
#define STRING_TOKEN 302
#define INT_TOKEN 303
-extern int get_token _PARAMS ((FILE *, sstring *));
+extern int get_token (FILE *, sstring *);
/* Current file and line numer, taking #-directives into account */
extern int source_lineno;
diff --git a/gcc/system.h b/gcc/system.h
index febe4453e385..6448c0cfc43f 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -23,12 +23,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#ifndef GCC_SYSTEM_H
#define GCC_SYSTEM_H
-/* We must include stdarg.h/varargs.h before stdio.h. */
-#ifdef ANSI_PROTOTYPES
+/* We must include stdarg.h before stdio.h. */
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifndef va_copy
# ifdef __va_copy
@@ -77,14 +73,14 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
# undef fputs
# define fputs(String, Stream) fputs_unlocked (String, Stream)
# if defined (HAVE_DECL_FPUTS_UNLOCKED) && !HAVE_DECL_FPUTS_UNLOCKED
-extern int fputs_unlocked PARAMS ((const char *, FILE *));
+extern int fputs_unlocked (const char *, FILE *);
# endif
# endif
# ifdef HAVE_FWRITE_UNLOCKED
# undef fwrite
# define fwrite(Ptr, Size, N, Stream) fwrite_unlocked (Ptr, Size, N, Stream)
# if defined (HAVE_DECL_FWRITE_UNLOCKED) && !HAVE_DECL_FWRITE_UNLOCKED
-extern int fwrite_unlocked PARAMS ((const PTR, size_t, size_t, FILE *));
+extern int fwrite_unlocked (const void *, size_t, size_t, FILE *);
# endif
# endif
# ifdef HAVE_FPRINTF_UNLOCKED
@@ -93,7 +89,7 @@ extern int fwrite_unlocked PARAMS ((const PTR, size_t, size_t, FILE *));
we have varargs macros. */
# define fprintf fprintf_unlocked
# if defined (HAVE_DECL_FPRINTF_UNLOCKED) && !HAVE_DECL_FPRINTF_UNLOCKED
-extern int fprintf_unlocked PARAMS ((FILE *, const char *, ...));
+extern int fprintf_unlocked (FILE *, const char *, ...);
# endif
# endif
@@ -283,39 +279,39 @@ extern int errno;
is running so be careful to test "defined (HAVE_DECL_*)". */
#if defined (HAVE_DECL_ATOF) && !HAVE_DECL_ATOF
-extern double atof PARAMS ((const char *));
+extern double atof (const char *);
#endif
#if defined (HAVE_DECL_ATOL) && !HAVE_DECL_ATOL
-extern long atol PARAMS ((const char *));
+extern long atol (const char *);
#endif
#if defined (HAVE_DECL_FREE) && !HAVE_DECL_FREE
-extern void free PARAMS ((PTR));
+extern void free (void *);
#endif
#if defined (HAVE_DECL_GETCWD) && !HAVE_DECL_GETCWD
-extern char *getcwd PARAMS ((char *, size_t));
+extern char *getcwd (char *, size_t);
#endif
#if defined (HAVE_DECL_GETENV) && !HAVE_DECL_GETENV
-extern char *getenv PARAMS ((const char *));
+extern char *getenv (const char *);
#endif
#if defined (HAVE_DECL_GETOPT) && !HAVE_DECL_GETOPT
-extern int getopt PARAMS ((int, char * const *, const char *));
+extern int getopt (int, char * const *, const char *);
#endif
#if defined (HAVE_DECL_GETWD) && !HAVE_DECL_GETWD
-extern char *getwd PARAMS ((char *));
+extern char *getwd (char *);
#endif
#if defined (HAVE_DECL_SBRK) && !HAVE_DECL_SBRK
-extern PTR sbrk PARAMS ((int));
+extern void *sbrk (int);
#endif
#if defined (HAVE_DECL_STRSTR) && !HAVE_DECL_STRSTR
-extern char *strstr PARAMS ((const char *, const char *));
+extern char *strstr (const char *, const char *);
#endif
#ifdef HAVE_MALLOC_H
@@ -323,15 +319,15 @@ extern char *strstr PARAMS ((const char *, const char *));
#endif
#if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
-extern PTR malloc PARAMS ((size_t));
+extern void *malloc (size_t);
#endif
#if defined (HAVE_DECL_CALLOC) && !HAVE_DECL_CALLOC
-extern PTR calloc PARAMS ((size_t, size_t));
+extern void *calloc (size_t, size_t);
#endif
#if defined (HAVE_DECL_REALLOC) && !HAVE_DECL_REALLOC
-extern PTR realloc PARAMS ((PTR, size_t));
+extern void *realloc (void *, size_t);
#endif
/* If the system doesn't provide strsignal, we get it defined in
@@ -339,17 +335,15 @@ extern PTR realloc PARAMS ((PTR, size_t));
#if !defined (HAVE_STRSIGNAL) \
|| (defined (HAVE_DECL_STRSIGNAL) && !HAVE_DECL_STRSIGNAL)
# ifndef strsignal
-extern const char *strsignal PARAMS ((int));
+extern const char *strsignal (int);
# endif
#endif
#ifdef HAVE_GETRLIMIT
# if defined (HAVE_DECL_GETRLIMIT) && !HAVE_DECL_GETRLIMIT
# ifndef getrlimit
-# ifdef ANSI_PROTOTYPES
struct rlimit;
-# endif
-extern int getrlimit PARAMS ((int, struct rlimit *));
+extern int getrlimit (int, struct rlimit *);
# endif
# endif
#endif
@@ -357,10 +351,8 @@ extern int getrlimit PARAMS ((int, struct rlimit *));
#ifdef HAVE_SETRLIMIT
# if defined (HAVE_DECL_SETRLIMIT) && !HAVE_DECL_SETRLIMIT
# ifndef setrlimit
-# ifdef ANSI_PROTOTYPES
struct rlimit;
-# endif
-extern int setrlimit PARAMS ((int, const struct rlimit *));
+extern int setrlimit (int, const struct rlimit *);
# endif
# endif
#endif
@@ -372,7 +364,7 @@ extern int setrlimit PARAMS ((int, const struct rlimit *));
#endif
#if defined (HAVE_DECL_ABORT) && !HAVE_DECL_ABORT
-extern void abort PARAMS ((void));
+extern void abort (void);
#endif
/* 1 if we have C99 designated initializers. */
--
GitLab