diff options
| author | kris <kris@FreeBSD.org> | 2002-10-26 01:12:30 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2002-10-26 01:12:30 +0000 |
| commit | 185cb76fc3af34cde7ae1ed49bba888d5bc0eeb2 (patch) | |
| tree | b9eddbbc303fa327f463ba302a50e2e607ed9e04 | |
| parent | 1e51a789f268ee342f2068858642a16a8900760d (diff) | |
| download | FreeBSD-ports-185cb76fc3af34cde7ae1ed49bba888d5bc0eeb2.zip FreeBSD-ports-185cb76fc3af34cde7ae1ed49bba888d5bc0eeb2.tar.gz | |
Fix build on -current (cope with removal of union wait, and add
#include <sys/ioctl_compat.h>)
Submitted by: mike
| -rw-r--r-- | japanese/sj3-lib/files/patch-ag | 12 | ||||
| -rw-r--r-- | japanese/sj3-lib/files/patch-sj3.c | 29 | ||||
| -rw-r--r-- | japanese/sj3-server/files/patch-ag | 12 | ||||
| -rw-r--r-- | japanese/sj3-server/files/patch-sj3.c | 29 | ||||
| -rw-r--r-- | japanese/sj3/files/patch-ag | 12 | ||||
| -rw-r--r-- | japanese/sj3/files/patch-sj3.c | 29 |
6 files changed, 87 insertions, 36 deletions
diff --git a/japanese/sj3-lib/files/patch-ag b/japanese/sj3-lib/files/patch-ag index 36759dbd..e69de29 100644 --- a/japanese/sj3-lib/files/patch-ag +++ b/japanese/sj3-lib/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-lib/files/patch-sj3.c b/japanese/sj3-lib/files/patch-sj3.c new file mode 100644 index 0000000..7d404c6 --- /dev/null +++ b/japanese/sj3-lib/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(); diff --git a/japanese/sj3-server/files/patch-ag b/japanese/sj3-server/files/patch-ag index 36759dbd..e69de29 100644 --- a/japanese/sj3-server/files/patch-ag +++ b/japanese/sj3-server/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-server/files/patch-sj3.c b/japanese/sj3-server/files/patch-sj3.c new file mode 100644 index 0000000..7d404c6 --- /dev/null +++ b/japanese/sj3-server/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(); diff --git a/japanese/sj3/files/patch-ag b/japanese/sj3/files/patch-ag index 36759dbd..e69de29 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 0000000..7d404c6 --- /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(); |
