cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't use union wait

Browse Source
This commit is contained in:
naddy 2011-11-13 16:03:15 +00:00
parent 03e09b9403
commit f47347c465
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/xdtm/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.27 2010/11/22 08:37:05 espie Exp $
# $OpenBSD: Makefile,v 1.28 2011/11/13 16:03:15 naddy Exp $
COMMENT= Desktop Manager: a graphical shell for X11
DISTNAME= xdtm-2.5.8
REVISION= 0
REVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}

30
x11/xdtm/patches/patch-appman_c Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-appman_c,v 1.1 2011/11/13 16:03:15 naddy Exp $
--- appman.c.orig Sun Nov 13 08:37:53 2011
+++ appman.c Sun Nov 13 08:47:56 2011
@@ -85,7 +85,7 @@
private void freeReturnStruct(void);
extern String getfilename(String);
private void increment_counter(AppProgram*, int, char*);
- extern void ioerr_dialog(int errno);
+ extern void ioerr_dialog(int errnum);
extern int openMasterAndSlave(int *, int *);
void pl_select_made(Widget, XtPointer, XtPointer);
private int plistcmp(const void *, const void *);
@@ -1297,7 +1297,7 @@ public int execute(fullname, filename, fullcmd, cwait,
#endif
FILE *processfp = NULL; /* file pointer to process */
String *newargs, args;
-#if !defined(SYSV) && !defined(SVR4_0) && !defined(_POSIX_SOURCE) && !defined(__386BSD__)
+#if !defined(SYSV) && !defined(SVR4_0) && !defined(_POSIX_SOURCE) && !defined(__386BSD__) && !defined(__OpenBSD__)
union wait w_stat; /* I'm not sure about the SYSV bit... */
#else
int w_stat;
@@ -1843,7 +1843,7 @@ public void child_died()
extern String cwd;
int pid;
-#if !defined(SYSV) && !defined(SVR4_0) && !defined(_POSIX_SOURCE)
+#if !defined(SYSV) && !defined(SVR4_0) && !defined(_POSIX_SOURCE) && !defined(__OpenBSD__)
union wait status;
#else
int status;