From: Ben Gras <ben@minix3.org>
Date: Mon, 21 Sep 2009 14:45:46 +0000 (+0000)
Subject: rename GETPID to MINIX_GETPID (for now); macro for field name
X-Git-Tag: v3.1.5~125
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=40411ea9085adf8a6543b2aafd3db6b923d979ad;p=minix.git

rename GETPID to MINIX_GETPID (for now); macro for field name
---

diff --git a/lib/posix/_getppid.c b/lib/posix/_getppid.c
index 7cc5c574c..a2a0f618e 100755
--- a/lib/posix/_getppid.c
+++ b/lib/posix/_getppid.c
@@ -11,6 +11,6 @@ PUBLIC pid_t getppid()
    * are not always successful and Minix returns the reserved value
    * (pid_t) -1 when there is an error.
    */
-  if (_syscall(MM, GETPID, &m) < 0) return ( (pid_t) -1);
+  if (_syscall(MM, MINIX_GETPID, &m) < 0) return ( (pid_t) -1);
   return( (pid_t) m.m2_i1);
 }
diff --git a/lib/posix/_ptrace.c b/lib/posix/_ptrace.c
index 35c13aed8..d4d7f52b9 100755
--- a/lib/posix/_ptrace.c
+++ b/lib/posix/_ptrace.c
@@ -12,7 +12,7 @@ long data;
 
   m.m2_i1 = pid;
   m.m2_i2 = req;
-  m.m2_l1 = addr;
+  m.PMTRACE_ADDR = addr;
   m.m2_l2 = data;
   if (_syscall(MM, PTRACE, &m) < 0) return(-1);