summaryrefslogtreecommitdiff
path: root/japanese/sj3
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2002-10-26 01:12:30 +0000
committerKris Kennaway <kris@FreeBSD.org>2002-10-26 01:12:30 +0000
commit9c233bec4b5a6a2fd86931700f24d630f1187357 (patch)
treeaa831137aecbe4263bb95aab0786260dbba3535b /japanese/sj3
parentRemove use of IPPORT_USERRESERVED, fix build on 5.0. (diff)
Fix build on -current (cope with removal of union wait, and add
#include <sys/ioctl_compat.h>) Submitted by: mike
Diffstat (limited to 'japanese/sj3')
-rw-r--r--japanese/sj3/files/patch-ag12
-rw-r--r--japanese/sj3/files/patch-sj3.c29
2 files changed, 29 insertions, 12 deletions
diff --git a/japanese/sj3/files/patch-ag b/japanese/sj3/files/patch-ag
index 36759dbda3f1..e69de29bb2d1 100644
--- a/japanese/sj3/files/patch-ag
+++ b/japanese/sj3/files/patch-ag
@@ -1,12 +0,0 @@
---- sj3/sj3.c.orig Sun Feb 6 18:55:38 2000
-+++ sj3/sj3.c Sun Feb 6 18:58:44 2000
-@@ -46,6 +46,9 @@
- #define LACKOF_SETLOCALE
- #endif
- #endif
-+#if defined(__FreeBSD__)
-+#include <sys/ioctl_compat.h>
-+#endif
- #include <curses.h>
- #endif
-
diff --git a/japanese/sj3/files/patch-sj3.c b/japanese/sj3/files/patch-sj3.c
new file mode 100644
index 000000000000..7d404c64e61b
--- /dev/null
+++ b/japanese/sj3/files/patch-sj3.c
@@ -0,0 +1,29 @@
+--- sj3/sj3.c.orig Wed Jan 14 00:52:48 1998
++++ sj3/sj3.c Fri Oct 25 10:51:35 2002
+@@ -46,6 +46,9 @@
+ #define LACKOF_SETLOCALE
+ #endif
+ #endif
++#if defined(__FreeBSD__)
++#include <sys/ioctl_compat.h>
++#endif
+ #include <curses.h>
+ #endif
+
+@@ -1058,14 +1061,13 @@
+ return;
+ if (info.si_code == CLD_STOPPED)
+ #else
+- union wait status;
+- int pid;
++ int pid, status;
+
+ /*
+ * Remove warning.
+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/10
+ */
+- pid = wait3 ((int *)&status, (WNOHANG|WUNTRACED), 0);
++ pid = wait3 (&status, (WNOHANG|WUNTRACED), 0);
+ if (WIFSTOPPED (status))
+ #endif
+ suspend();