Linux/powerpc and SunOS fixes

diff --git a/ChangeLog b/ChangeLog
index a528703d30ecf2d6e1bc9482284ce4e662c24f48..8f1812cfcac370c34bca88e24bf50abb235419cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jun 22 17:26:33 CEST 1999
+
+  * Fixed some Linux/powerpc sillyness, thanks to Daniel Jacobowitz
+  * Fixed some SunOS compile problems earlier that I forgot to include
+    here
+
 Mon Jun 14 12:44:25 CEST 1999
 
   * Avoid leakint fd into child when forking, patch from

diff --git a/mem.c b/mem.c
index cbb1ca31d6159c0d6599d7a5c130a4d64f2309e2..e2930380283396cfde8b2256bb6569c4ccd7b181 100644 (file)
--- a/mem.c
+++ b/mem.c
@@ -148,11 +148,11 @@ struct tcb *tcp;
 #endif /* !LINUX */
 
        if (entering(tcp)) {
-#if defined(LINUX) && !defined(ALPHA) && !defined(sparc) || defined(POWERPC)
+#if defined(LINUX) && !defined(ALPHA) && !defined(sparc) && !defined(POWERPC)
                if (umoven(tcp, tcp->u_arg[0], sizeof u_arg,
                                (char *) u_arg) == -1)
                        return 0;
-#endif /* LINUX && !ALPHA && !sparc && !powerpc*/
+#endif /* LINUX && !ALPHA && !sparc && !POWERPC */
 
                /* addr */
                if (!u_arg[0])

diff --git a/syscall.c b/syscall.c
index 5ff3906e1c410145d36dbfd91dae68e4ba7d2717..e8d8a1f9e32ecd5e94fbb3e52539c733a7eeea12 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -135,7 +135,8 @@ int nerrnos;
 int current_personality;
 
 int
-set_personality(int personality)
+set_personality(personality)
+int personality;
 {
        switch (personality) {
        case 0:
@@ -419,7 +420,8 @@ const int socket_map [] = {
 };
 
 void
-sparc_socket_decode (struct tcb *tcp)
+sparc_socket_decode (tcp)
+struct tcb *tcp;
 {
        volatile long addr;
        volatile int i, n;

diff --git a/util.c b/util.c
index 6d075b45f1662717ad436c74c78294a415437817..34cfa0f4dadc39ccf8c29a07e9e150d054874fcf 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1092,7 +1092,7 @@ struct tcb *tcp;
 #ifdef SUNOS4
 #ifdef SPARC   /* This code is slightly sparc specific */
 
-       struct pt_regs regs;
+       struct regs regs;
 #define BPT    0x91d02001      /* ta   1 */
 #define LOOP   0x10800000      /* ba   0 */
 #define LOOPA  0x30800000      /* ba,a 0 */
@@ -1247,7 +1247,7 @@ struct tcb *tcp;
 #ifdef SPARC
 
 #if !LOOPA
-       struct pt_regs regs;
+       struct regs regs;
 #endif
 
        if (!(tcp->flags & TCB_BPTSET)) {