sim: ppc: cleanup getrusage decls

Don't conflate HAVE_GETRUSAGE & HAVE_SYS_RESOURCE_H.  Use the latter
to include the header and nothing else.  Use the former to determine
whether to use the function and nothing else.  If we find a system
that doesn't follow POSIX and provides only one of these, we can
figure out how to support it then.  The manual local definition is
clashing with the system ones and leading to build failures with
newer C standards.

sim/ppc/emul_netbsd.c:51:5: error: a function declaration without a
	prototype is deprecated in all versions of C and is treated as a
	zero-parameter prototype in C2x, conflicting with a previous
	declaration [-Werror,-Wdeprecated-non-prototype]

diff --git a/sim/ppc/emul_netbsd.c b/sim/ppc/emul_netbsd.c
index 51f8e98ae32b14a637aea9d07799f75e52c4b6f0..950f1f4a696a77555cc56b92bcfd7c7953b76c87 100644 (file)
--- a/sim/ppc/emul_netbsd.c
+++ b/sim/ppc/emul_netbsd.c
@@ -40,15 +40,8 @@
 #include "emul_generic.h"
 #include "emul_netbsd.h"
 
-#ifdef HAVE_GETRUSAGE
-#ifndef HAVE_SYS_RESOURCE_H
-#undef HAVE_GETRUSAGE
-#endif
-#endif
-
-#ifdef HAVE_GETRUSAGE
+#ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
-int getrusage();
 #endif
 
 #if HAVE_SYS_IOCTL_H

diff --git a/sim/ppc/emul_unix.c b/sim/ppc/emul_unix.c
index be9e8385f526645da5ebf83165bc82d886af893a..88f6e3abc0a2809b21026c7fd678f1370a590f0d 100644 (file)
--- a/sim/ppc/emul_unix.c
+++ b/sim/ppc/emul_unix.c
@@ -87,15 +87,8 @@
 #include <sys/termio.h>
 #endif
 
-#ifdef HAVE_GETRUSAGE
-#ifndef HAVE_SYS_RESOURCE_H
-#undef HAVE_GETRUSAGE
-#endif
-#endif
-
-#ifdef HAVE_GETRUSAGE
+#ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
-int getrusage();
 #endif
 
 #if HAVE_DIRENT_H

diff --git a/sim/ppc/mon.c b/sim/ppc/mon.c
index 8ab42af8458903210768a53a559428044119a6bf..8bbabe6e50d49004bf7ae87f78ac70ed87f798d6 100644 (file)
--- a/sim/ppc/mon.c
+++ b/sim/ppc/mon.c
@@ -36,7 +36,6 @@
 
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
-int getrusage();
 #endif
 
 #include "basics.h"