yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* callback.c: Remove ANSI_PROTOTYPES conditional code.

Browse Source 
* sim-load.c: Likewise.
	* syscall.c: Likewise.
This commit is contained in:
Ben Elliston 2005-07-08 08:05:35 +00:00
parent 4eeb4f8dbf
commit 3b02a06bd6
4 changed files with 6 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sim/common/ChangeLog
View File

@ -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> 2005-05-24 Corinna Vinschen <vinschen@redhat.com>
* Make-common.in (LIBDEPS): Correctly use INTLDEPS for dependency * Make-common.in (LIBDEPS): Correctly use INTLDEPS for dependency

44
sim/common/callback.c
View File

@ -26,11 +26,7 @@
#include "cconfig.h" #include "cconfig.h"
#endif #endif
#include "ansidecl.h" #include "ansidecl.h"
#ifdef ANSI_PROTOTYPES
#include <stdarg.h> #include <stdarg.h>
#else
#include <varargs.h>
#endif
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
#include <stdlib.h> #include <stdlib.h>
@ -755,23 +751,10 @@ os_init (p)
/* VARARGS */ /* VARARGS */
static void static void
#ifdef ANSI_PROTOTYPES
os_printf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, ...) 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; va_list args;
#ifdef ANSI_PROTOTYPES
va_start (args, format); va_start (args, format);
#else
char *format;
va_start (args);
format = va_arg (args, char *);
#endif
vfprintf (stdout, format, args); vfprintf (stdout, format, args);
va_end (args); va_end (args);
@ -779,51 +762,24 @@ os_printf_filtered (p, va_alist)
/* VARARGS */ /* VARARGS */
static void static void
#ifdef ANSI_PROTOTYPES
os_vprintf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, va_list args) 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); vprintf (format, args);
} }
/* VARARGS */ /* VARARGS */
static void static void
#ifdef ANSI_PROTOTYPES
os_evprintf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, va_list args) 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); vfprintf (stderr, format, args);
} }
/* VARARGS */ /* VARARGS */
static void static void
#ifdef ANSI_PROTOTYPES
os_error (host_callback *p ATTRIBUTE_UNUSED, const char *format, ...) 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; va_list args;
#ifdef ANSI_PROTOTYPES
va_start (args, format); va_start (args, format);
#else
char *format;
va_start (args);
format = va_arg (args, char *);
#endif
vfprintf (stderr, format, args); vfprintf (stderr, format, args);
fprintf (stderr, "\n"); fprintf (stderr, "\n");

16
sim/common/sim-load.c
View File

@ -24,11 +24,7 @@ along with this program; if not, write to the Free Software Foundation, Inc.,
#endif #endif
#include "ansidecl.h" #include "ansidecl.h"
#include <stdio.h> /* for NULL */ #include <stdio.h> /* for NULL */
#ifdef ANSI_PROTOTYPES
#include <stdarg.h> #include <stdarg.h>
#else
#include <varargs.h>
#endif
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
#include <stdlib.h> #include <stdlib.h>
#endif #endif
@ -176,17 +172,11 @@ sim_load_file (sd, myname, callback, prog, prog_bfd, verbose_p, lma_p, do_write)
static void static void
xprintf VPARAMS ((host_callback *callback, const char *fmt, ...)) xprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
{ {
#ifndef ANSI_PROTOTYPES
host_callback *callback; host_callback *callback;
char *fmt; char *fmt;
#endif
va_list ap; va_list ap;
VA_START (ap, fmt); 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); (*callback->vprintf_filtered) (callback, fmt, ap);
@ -196,17 +186,11 @@ xprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
static void static void
eprintf VPARAMS ((host_callback *callback, const char *fmt, ...)) eprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
{ {
#ifndef ANSI_PROTOTYPES
host_callback *callback; host_callback *callback;
char *fmt; char *fmt;
#endif
va_list ap; va_list ap;
VA_START (ap, fmt); 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); (*callback->evprintf_filtered) (callback, fmt, ap);

4
sim/common/syscall.c
View File

@ -29,11 +29,7 @@
#endif #endif
#include "ansidecl.h" #include "ansidecl.h"
#include "libiberty.h" #include "libiberty.h"
#ifdef ANSI_PROTOTYPES
#include <stdarg.h> #include <stdarg.h>
#else
#include <varargs.h>
#endif
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
#include <stdlib.h> #include <stdlib.h>