aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Elliston <bje@au.ibm.com>2005-07-08 08:05:35 +0000
committerBen Elliston <bje@au.ibm.com>2005-07-08 08:05:35 +0000
commit3b02a06bd6d4345b8aea0843f2bffe75ee05d056 (patch)
tree84699d7f879f7f064df5a5ab87ea03cf65e8a6f0
parent4eeb4f8dbf7cb33b7a8b15b7d67661ba80a2a157 (diff)
downloadgdb-3b02a06bd6d4345b8aea0843f2bffe75ee05d056.zip
gdb-3b02a06bd6d4345b8aea0843f2bffe75ee05d056.tar.gz
gdb-3b02a06bd6d4345b8aea0843f2bffe75ee05d056.tar.bz2
* callback.c: Remove ANSI_PROTOTYPES conditional code.
* sim-load.c: Likewise. * syscall.c: Likewise.
-rw-r--r--sim/common/ChangeLog6
-rw-r--r--sim/common/callback.c44
-rw-r--r--sim/common/sim-load.c16
-rw-r--r--sim/common/syscall.c4
4 files changed, 6 insertions, 64 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index cdd012a..7a43a29 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-08 Ben Elliston <bje@au.ibm.com>
+
+ * callback.c: Remove ANSI_PROTOTYPES conditional code.
+ * sim-load.c: Likewise.
+ * syscall.c: Likewise.
+
2005-05-24 Corinna Vinschen <vinschen@redhat.com>
* Make-common.in (LIBDEPS): Correctly use INTLDEPS for dependency
diff --git a/sim/common/callback.c b/sim/common/callback.c
index bb7bc47..570e294 100644
--- a/sim/common/callback.c
+++ b/sim/common/callback.c
@@ -26,11 +26,7 @@
#include "cconfig.h"
#endif
#include "ansidecl.h"
-#ifdef ANSI_PROTOTYPES
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
@@ -755,23 +751,10 @@ os_init (p)
/* VARARGS */
static void
-#ifdef ANSI_PROTOTYPES
os_printf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, ...)
-#else
-os_printf_filtered (p, va_alist)
- host_callback *p;
- va_dcl
-#endif
{
va_list args;
-#ifdef ANSI_PROTOTYPES
va_start (args, format);
-#else
- char *format;
-
- va_start (args);
- format = va_arg (args, char *);
-#endif
vfprintf (stdout, format, args);
va_end (args);
@@ -779,51 +762,24 @@ os_printf_filtered (p, va_alist)
/* VARARGS */
static void
-#ifdef ANSI_PROTOTYPES
os_vprintf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, va_list args)
-#else
-os_vprintf_filtered (p, format, args)
- host_callback *p;
- const char *format;
- va_list args;
-#endif
{
vprintf (format, args);
}
/* VARARGS */
static void
-#ifdef ANSI_PROTOTYPES
os_evprintf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, va_list args)
-#else
-os_evprintf_filtered (p, format, args)
- host_callback *p;
- const char *format;
- va_list args;
-#endif
{
vfprintf (stderr, format, args);
}
/* VARARGS */
static void
-#ifdef ANSI_PROTOTYPES
os_error (host_callback *p ATTRIBUTE_UNUSED, const char *format, ...)
-#else
-os_error (p, va_alist)
- host_callback *p;
- va_dcl
-#endif
{
va_list args;
-#ifdef ANSI_PROTOTYPES
va_start (args, format);
-#else
- char *format;
-
- va_start (args);
- format = va_arg (args, char *);
-#endif
vfprintf (stderr, format, args);
fprintf (stderr, "\n");
diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c
index 5fc4c98..c140beb 100644
--- a/sim/common/sim-load.c
+++ b/sim/common/sim-load.c
@@ -24,11 +24,7 @@ along with this program; if not, write to the Free Software Foundation, Inc.,
#endif
#include "ansidecl.h"
#include <stdio.h> /* for NULL */
-#ifdef ANSI_PROTOTYPES
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -176,17 +172,11 @@ sim_load_file (sd, myname, callback, prog, prog_bfd, verbose_p, lma_p, do_write)
static void
xprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
{
-#ifndef ANSI_PROTOTYPES
host_callback *callback;
char *fmt;
-#endif
va_list ap;
VA_START (ap, fmt);
-#ifndef ANSI_PROTOTYPES
- callback = va_arg (ap, host_callback *);
- fmt = va_arg (ap, char *);
-#endif
(*callback->vprintf_filtered) (callback, fmt, ap);
@@ -196,17 +186,11 @@ xprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
static void
eprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
{
-#ifndef ANSI_PROTOTYPES
host_callback *callback;
char *fmt;
-#endif
va_list ap;
VA_START (ap, fmt);
-#ifndef ANSI_PROTOTYPES
- callback = va_arg (ap, host_callback *);
- fmt = va_arg (ap, char *);
-#endif
(*callback->evprintf_filtered) (callback, fmt, ap);
diff --git a/sim/common/syscall.c b/sim/common/syscall.c
index 45f063e..452fa79 100644
--- a/sim/common/syscall.c
+++ b/sim/common/syscall.c
@@ -29,11 +29,7 @@
#endif
#include "ansidecl.h"
#include "libiberty.h"
-#ifdef ANSI_PROTOTYPES
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>