3 files changed, 11 insertions, 11 deletions
diff --git a/sim/ppc/emul_netbsd.c b/sim/ppc/emul_netbsd.c
index 950f1f4..37e6c08 100644
--- a/sim/ppc/emul_netbsd.c
+++ b/sim/ppc/emul_netbsd.c
@@ -146,13 +146,13 @@ write_stat(unsigned_word addr,
   /* H2T(buf.st_spare2); */
   H2T(buf.st_ctime);
   /* H2T(buf.st_spare3); */
-#ifdef AC_STRUCT_ST_RDEV
+#ifdef HAVE_STRUCT_STAT_ST_RDEV
   H2T(buf.st_rdev);
 #endif
-#ifdef AC_STRUCT_ST_BLKSIZE
+#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
   H2T(buf.st_blksize);
 #endif
-#ifdef AC_STRUCT_ST_BLOCKS
+#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
   H2T(buf.st_blocks);
 #endif
 #if WITH_NetBSD_HOST
diff --git a/sim/ppc/emul_unix.c b/sim/ppc/emul_unix.c
index 88f6e3a..e63a930 100644
--- a/sim/ppc/emul_unix.c
+++ b/sim/ppc/emul_unix.c
@@ -1094,19 +1094,19 @@ convert_to_solaris_stat(unsigned_word addr,
   target.st_gid   = H2T_4(host->st_gid);
   target.st_size  = H2T_4(host->st_size);
 
-#ifdef HAVE_ST_RDEV
+#ifdef HAVE_STRUCT_STAT_ST_RDEV
   target.st_rdev  = H2T_4(host->st_rdev);
 #else
   target.st_rdev  = 0;
 #endif
 
-#ifdef HAVE_ST_BLKSIZE
+#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
   target.st_blksize = H2T_4(host->st_blksize);
 #else
   target.st_blksize = 0;
 #endif
 
-#ifdef HAVE_ST_BLOCKS
+#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
   target.st_blocks  = H2T_4(host->st_blocks);
 #else
   target.st_blocks  = 0;
@@ -2043,19 +2043,19 @@ convert_to_linux_stat(unsigned_word addr,
   target.st_gid   = H2T_4(host->st_gid);
   target.st_size  = H2T_4(host->st_size);
 
-#ifdef HAVE_ST_RDEV
+#ifdef HAVE_STRUCT_STAT_ST_RDEV
   target.st_rdev  = H2T_4(host->st_rdev);
 #else
   target.st_rdev  = 0;
 #endif
 
-#ifdef HAVE_ST_BLKSIZE
+#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
   target.st_blksize = H2T_4(host->st_blksize);
 #else
   target.st_blksize = 0;
 #endif
 
-#ifdef HAVE_ST_BLOCKS
+#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
   target.st_blocks  = H2T_4(host->st_blocks);
 #else
   target.st_blocks  = 0;
diff --git a/sim/ppc/main.c b/sim/ppc/main.c
index 987e89e..afce983 100644
--- a/sim/ppc/main.c
+++ b/sim/ppc/main.c
@@ -245,7 +245,7 @@ zalloc(long size)
 
 /* When a CNTRL-C occures, queue an event to shut down the simulation */
 
-static RETSIGTYPE
+static void
 cntrl_c(int sig)
 {
   psim_stop (simulation);
@@ -289,7 +289,7 @@ main(int argc, char * const *argv)
   psim_stack(simulation, argv, environ);
 
   {
-    RETSIGTYPE (*prev) (int);
+    void (*prev) (int);
     prev = signal(SIGINT, cntrl_c);
     psim_run(simulation);
     signal(SIGINT, prev);