Module Name:src
Committed By: dholland
Date: Sun Nov 15 18:27:41 UTC 2009
Modified Files:
src/sys/arch/x68k/stand/aout2hux: aout2hux.c type_local.h
Log Message:
Remove PROTO(), which is like _P() only spelled differently.
The change causes gcc to harmlessly permute two instructions in the output
for some reason, but otherwise has no effect on the generated code.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x68k/stand/aout2hux/aout2hux.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x68k/stand/aout2hux/type_local.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/aout2hux/aout2hux.c
diff -u src/sys/arch/x68k/stand/aout2hux/aout2hux.c:1.11 src/sys/arch/x68k/stand/aout2hux/aout2hux.c:1.12
--- src/sys/arch/x68k/stand/aout2hux/aout2hux.c:1.11 Sun Nov 15 18:24:23 2009
+++ src/sys/arch/x68k/stand/aout2hux/aout2hux.c Sun Nov 15 18:27:40 2009
@@ -21,7 +21,7 @@
* % cc -N -static -Wl,-Ttext,10203040 -o aout2 *.o
* % aout2hux -o foo.x aout1 0 aout2 10203040
*
- * $NetBSD: aout2hux.c,v 1.11 2009/11/15 18:24:23 dholland Exp $
+ * $NetBSD: aout2hux.c,v 1.12 2009/11/15 18:27:40 dholland Exp $
*/
#include sys/types.h
@@ -61,23 +61,22 @@
u_int32_t entry_addr; /* entry point address */
};
-unsigned get_uint16 PROTO((be_uint16_t *be));
-u_int32_t get_uint32 PROTO((be_uint32_t *be));
-void put_uint16 PROTO((be_uint16_t *be, unsigned v));
-void put_uint32 PROTO((be_uint32_t *be, u_int32_t v));
-void *do_realloc PROTO((void *p, size_t s));
+unsigned get_uint16(be_uint16_t *be);
+u_int32_t get_uint32(be_uint32_t *be);
+void put_uint16(be_uint16_t *be, unsigned v);
+void put_uint32(be_uint32_t *be, u_int32_t v);
+void *do_realloc(void *p, size_t s);
static int open_aout(const char *fn, struct aout_m68k *hdr,
struct exec_info *inf);
-static int open_elf PROTO((const char *fn, FILE *fp, struct elf_m68k_hdr *hdr,
- struct exec_info *inf));
-FILE *open_exec PROTO((const char *fn, struct exec_info *inf));
-int check_2_exec_inf PROTO((struct exec_info *inf1, struct exec_info *inf2));
-int aout2hux PROTO((const char *fn1, const char *fn2,
- u_int32_t loadadr1, u_int32_t loadadr2, const char *fnx));
-int gethex PROTO((u_int32_t *pval, const char *str));
-void usage PROTO((const char *name));
-int main PROTO((int argc, char *argv[]));
+static int open_elf(const char *fn, FILE *fp, struct elf_m68k_hdr *hdr,
+ struct exec_info *inf);
+FILE *open_exec(const char *fn, struct exec_info *inf);
+int check_2_exec_inf(struct exec_info *inf1, struct exec_info *inf2);
+int aout2hux(const char *fn1, const char *fn2,
+ u_int32_t loadadr1, u_int32_t loadadr2, const char *fnx);
+int gethex(u_int32_t *pval, const char *str);
+void usage(const char *name);
#if !defined(bzero) defined(__SVR4)
# define bzero(d, n) memset((d), 0, (n))
@@ -724,7 +723,7 @@
}
#ifndef NO_BIST
-void bist PROTO((void));
+void bist(void);
/*
* built-in self test
Index: src/sys/arch/x68k/stand/aout2hux/type_local.h
diff -u src/sys/arch/x68k/stand/aout2hux/type_local.h:1.1 src/sys/arch/x68k/stand/aout2hux/type_local.h:1.2
--- src/sys/arch/x68k/stand/aout2hux/type_local.h:1.1 Tue Sep 1 19:51:09 1998
+++ src/sys/arch/x68k/stand/aout2hux/type_local.h Sun Nov 15 18:27:40 2009
@@ -4,13 +4,10 @@
* written by Yasha (ITOH Yasufumi)
* public domain
*
- * $NetBSD: type_local.h,v 1.1 1998/09/01 19:51:09 itohy Exp $
+ * $NetBSD: type_local.h,v 1.2 2009/11/15 18:27:40 dholland Exp $
*/
-#ifdef __STDC__
-# define PROTO(x) x
-#else
-# define PROTO(x) ()
+#ifndef __STDC__
# ifndef const
# define const
# endif
