|
Lines 1-45
Link Here
|
| 1 |
|
1 |
--- src/engine.c.orig Tue Nov 1 16:57:31 2005 |
| 2 |
$FreeBSD: ports/x11/xautolock/files/patch-aa,v 1.3 2004/08/22 15:46:35 krion Exp $ |
2 |
+++ src/engine.c Tue Nov 1 17:11:51 2005 |
| 3 |
|
3 |
@@ -209,7 +209,9 @@ |
| 4 |
--- xautolock.c.orig Thu Mar 11 23:43:25 1999 |
|
|
| 5 |
+++ xautolock.c Sun Aug 22 17:45:10 2004 |
| 6 |
@@ -297,6 +297,8 @@ |
| 7 |
* with vroot.h, because it needs to know the real root window. |
| 8 |
*/ |
| 9 |
|
| 10 |
+#include <sys/param.h> |
| 11 |
+ |
| 12 |
#if defined(hpux) || defined (__hpux) |
| 13 |
#ifndef _HPUX_SOURCE |
| 14 |
#define _HPUX_SOURCE |
| 15 |
@@ -368,7 +370,9 @@ |
| 16 |
#endif /* !NOSTDHDRS */ |
| 17 |
|
| 18 |
#if !defined (apollo) && !defined (VMS) |
| 19 |
+#if !defined (BSD) |
| 20 |
#include <malloc.h> |
| 21 |
+#endif /* !BSD */ |
| 22 |
#include <unistd.h> |
| 23 |
#endif /* !apollo && !VMS */ |
| 24 |
|
| 25 |
@@ -1970,7 +1974,8 @@ |
| 26 |
#ifdef __GNUC__ |
| 27 |
default: /* Makes gcc -Wall shut up. */ |
| 28 |
#endif /* __GNUC__ */ |
| 29 |
- } |
| 30 |
+ break; |
| 31 |
+ } |
| 32 |
} |
| 33 |
} |
| 34 |
else |
| 35 |
@@ -2028,7 +2033,9 @@ |
| 36 |
#else /* VMS */ |
4 |
#else /* VMS */ |
| 37 |
if (locker_pid) |
5 |
if (lockerPid) |
| 38 |
{ |
6 |
{ |
| 39 |
-#if !defined (UTEKV) && !defined (SYSV) && !defined(SVR4) |
7 |
-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4) |
| 40 |
+#if defined (BSD) |
8 |
+#if defined (__FreeBSD__) |
| 41 |
+ int status; |
9 |
+ int status; |
| 42 |
+#elif !defined (UTEKV) && !defined (SYSV) && !defined(SVR4) |
10 |
+#elif !defined (UTEKV) && !defined (SYSV) && !defined (SVR4) |
| 43 |
union wait status; /* childs process status */ |
11 |
union wait status; /* childs process status */ |
| 44 |
#else /* !UTEKV && !SYSV && !SVR4 */ |
12 |
#else /* !UTEKV && !SYSV && !SVR4 */ |
| 45 |
int status = 0; /* childs process status */ |
13 |
int status = 0; /* childs process status */ |