Fixed compilation errors in ps.c and rs/manager.c. The former was fixed by disabling...

diff --git a/commands/ps/ps.c b/commands/ps/ps.c
index b482126d3f4684822dbdd8fc4a68bda0a82ec430..8531818fcf4ea7189d1235b3c946904d504bebb5 100644 (file)
--- a/commands/ps/ps.c
+++ b/commands/ps/ps.c
@@ -245,6 +245,7 @@ struct pstat *bufp;
        else if (bufp->ps_mflags & SIGSUSPENDED)
                blkstr = "sigsusp";
   } else if (bufp->ps_recv == FS_PROC_NR) {
+#if 0 /* these flags no longer exist, should find this out another way */
        if (-bufp->ps_ftask == XPIPE)
                blkstr = "pipe";
        else if (-bufp->ps_ftask == XPOPEN)
@@ -255,7 +256,9 @@ struct pstat *bufp;
                blkstr = "flock";
        else if(-bufp->ps_ftask == XSELECT)
                blkstr = "select";
-       else if(-bufp->ps_ftask >= 0)
+       else 
+#endif 
+       if(-bufp->ps_ftask >= 0)
                blkstr = taskname(-bufp->ps_ftask);
        else
                blkstr = "??";
@@ -526,7 +529,11 @@ int endpoints;
        else if (ps_proc[p_ki].p_rts_flags == 0)
                bufp->ps_state = R_STATE;       /* in run-queue */
        else if (ps_mproc[p_nr].mp_flags & (WAITING | PAUSED | SIGSUSPENDED) ||
-                ps_fproc[p_nr].fp_suspended == SUSPENDED)
+#if 0 /* this field and this flag no longer exist, get this info elsewhere */
+               ps_fproc[p_nr].fp_suspended == SUSPENDED)
+#else
+               0)
+#endif
                bufp->ps_state = S_STATE;       /* sleeping */
        else
                bufp->ps_state = W_STATE;       /* a short wait */

diff --git a/include/minix/syslib.h b/include/minix/syslib.h
index 4c2a025f6ba1835d13aa56b2938d3c60e34766e3..355e82adb4df7aa86d0cc4fbb38be95e9d076bd7 100755 (executable)
--- a/include/minix/syslib.h
+++ b/include/minix/syslib.h
@@ -40,7 +40,7 @@ _PROTOTYPE( int sys_newmap, (endpoint_t proc_ep, struct mem_map *ptr));
 _PROTOTYPE( int sys_exit, (endpoint_t proc_ep));
 _PROTOTYPE( int sys_trace, (int req, endpoint_t proc_ep, long addr, long *data_p));
 
-_PROTOTYPE( int sys_privctl, (endpoint_t proc_ep, int req, int i, void *p));
+_PROTOTYPE( int sys_privctl, (endpoint_t proc_ep, int req, void *p));
 _PROTOTYPE( int sys_setgrant, (cp_grant_t *grants, int ngrants));
 _PROTOTYPE( int sys_nice, (endpoint_t proc_ep, int priority));
 

diff --git a/lib/syslib/sys_privctl.c b/lib/syslib/sys_privctl.c
index b3a61588a333e0dff0c882f1f64c03e356dc8eab..c53a7d6c4e50284e0f0299213975f6428139e09c 100644 (file)
--- a/lib/syslib/sys_privctl.c
+++ b/lib/syslib/sys_privctl.c
@@ -1,6 +1,6 @@
 #include "syslib.h"
 
-int sys_privctl(endpoint_t proc_ep, int request, int i, void *p)
+int sys_privctl(endpoint_t proc_ep, int request, void *p)
 {
   message m;