From kde-devel  Sat Jan 10 21:04:24 2004
From: David Leimbach <leimy2k () mac ! com>
Date: Sat, 10 Jan 2004 21:04:24 +0000
To: kde-devel
Subject: DragonFly patch for kdebase/kcontrol/kfontinst/lib/GetPid.c
Message-Id: <9199C3B3-43B0-11D8-B640-000A95AFBEB4 () mac ! com>
X-MARC-Message: https://marc.info/?l=kde-devel&m=107376884020937
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--Apple-Mail-2-972183883"


--Apple-Mail-2-972183883
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	format=flowed

This is the last patch needed to make today's CVS compile on DragonFly.


--Apple-Mail-2-972183883
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream; x-unix-mode=0644; name="GetPid.c.patch"
Content-Disposition: attachment;
	filename=GetPid.c.patch

Index: GetPid.c
===================================================================
RCS file: /home/kde/kdebase/kcontrol/kfontinst/lib/GetPid.c,v
retrieving revision 1.8
diff -u -r1.8 GetPid.c
--- GetPid.c	15 Dec 2003 14:05:16 -0000	1.8
+++ GetPid.c	10 Jan 2004 21:00:11 -0000
@@ -31,8 +31,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#if defined(__DragonFly__)
+#include <sys/param.h>
+#endif
+
 #include <sys/types.h>
 
+#if defined(__DragonFly__)
+#include <sys/user.h>
+#endif
+
 #ifndef __cplusplus
 #define bool unsigned int
 #define false 0
@@ -210,7 +219,11 @@
                 else
                     pid=p[num].ki_pid;
 #else
+#if defined(__DragonFly__)
+	    if(proc_p.kp_eproc.e_ppid==ppid && p[num].kp_thread.td_comm && 0==strcmp(p[num].kp_thread.td_comm, proc))
+#else
             if(proc_p.kp_eproc.e_ppid==ppid && p[num].kp_proc.p_comm && 0==strcmp(p[num].kp_proc.p_comm, proc))
+#endif
                 if(pid)
                     error=true;
                 else

--Apple-Mail-2-972183883
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<

--Apple-Mail-2-972183883--