Fix some warnings that would be generated by gcc -Wredundant-decls

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5115 c046a42c-6fe2-441c-8c8c-71466251a162

6 files changed, 1 insertions, 14 deletions

diff --git a/linux-user/arm/nwfpe/fpa11_cprt.c b/linux-user/arm/nwfpe/fpa11_cprt.c
index 04eae8c6f..fafa120c9 100644
--- a/linux-user/arm/nwfpe/fpa11_cprt.c
+++ b/linux-user/arm/nwfpe/fpa11_cprt.c
@@ -27,8 +27,6 @@
 //#include "fpmodule.h"
 //#include "fpmodule.inl"
 
-void SetRoundingMode(const unsigned int opcode);
-
 unsigned int PerformFLT(const unsigned int opcode);
 unsigned int PerformFIX(const unsigned int opcode);
 
diff --git a/linux-user/arm/syscall.h b/linux-user/arm/syscall.h
index f06da76dd..003d42470 100644
--- a/linux-user/arm/syscall.h
+++ b/linux-user/arm/syscall.h
@@ -40,5 +40,3 @@ struct target_pt_regs {
 #else
 #define UNAME_MACHINE "armv5tel"
 #endif
-
-uint32_t do_arm_semihosting(CPUState *);
diff --git a/linux-user/m68k/syscall.h b/linux-user/m68k/syscall.h
index 47cc66b14..2fd85dd6f 100644
--- a/linux-user/m68k/syscall.h
+++ b/linux-user/m68k/syscall.h
@@ -18,5 +18,4 @@ struct target_pt_regs {
 
 #define UNAME_MACHINE "m68k"
 
-void do_m68k_semihosting(CPUState *, int);
 void do_m68k_simcall(CPUState *, int);
diff --git a/linux-user/main.c b/linux-user/main.c
index 32f5455e6..cca696cfa 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -477,9 +477,6 @@ void cpu_loop(CPUX86State *env)
 
 #ifdef TARGET_ARM
 
-/* XXX: find a better solution */
-extern void tb_invalidate_page_range(abi_ulong start, abi_ulong end);
-
 static void arm_cache_flush(abi_ulong start, abi_ulong last)
 {
     abi_ulong addr, last1;
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index d3a3c3c20..a12cc9b69 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -199,8 +199,7 @@ int get_osversion(void);
 void fork_start(void);
 void fork_end(int child);
 
-extern int loglevel;
-extern FILE *logfile;
+#include "qemu-log.h"
 
 /* strace.c */
 void print_syscall(int num,
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 741ebd644..eba2c02ad 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -269,10 +269,6 @@ extern int personality(int);
 extern int flock(int, int);
 extern int setfsuid(int);
 extern int setfsgid(int);
-extern int setresuid(uid_t, uid_t, uid_t);
-extern int getresuid(uid_t *, uid_t *, uid_t *);
-extern int setresgid(gid_t, gid_t, gid_t);
-extern int getresgid(gid_t *, gid_t *, gid_t *);
 extern int setgroups(int, gid_t *);
 
 #define ERRNO_TABLE_SIZE 1200