summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-08-28 02:39:29 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-08-28 02:39:29 +0000
commitc1454b3acbc28ea629b49ea758a1ba43b6fa01ee (patch)
treeb174b12dba3fcee7dc2162d7d13df4d88b8377e9
parenta13ebdb8364025f15352670431d1f6db34f9df30 (diff)
* win32/win32.h: define SIGINT and SIGKILL if not defined.
* win32/win32.c: remove definition of SIGINT and SIGKILL. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--win32/win32.c7
-rw-r--r--win32/win32.h9
3 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b3668d266e..e6ef5ed741e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 28 11:37:35 2002 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.h: define SIGINT and SIGKILL if not defined.
+
+ * win32/win32.c: remove definition of SIGINT and SIGKILL.
+
Tue Aug 27 19:50:27 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* ruby.c (require_libraries): prevent ruby_sorcefile from GC.
diff --git a/win32/win32.c b/win32/win32.c
index d10b68fbef7..e9edfdfc14c 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2332,13 +2332,6 @@ chown(const char *path, int owner, int group)
return 0;
}
-#include <signal.h>
-#ifndef SIGINT
-#define SIGINT 2
-#endif
-#ifndef SIGKILL
-#define SIGKILL 9
-#endif
int
kill(int pid, int sig)
{
diff --git a/win32/win32.h b/win32/win32.h
index c5873c62b7b..b33d075e665 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -53,6 +53,7 @@ extern "C++" {
#include <process.h>
#include <time.h>
#include <math.h>
+#include <signal.h>
#include <sys/stat.h>
#include <sys/types.h>
#if !defined(__BORLANDC__)
@@ -273,6 +274,14 @@ extern char *rb_w32_strerror(int);
#endif
+#ifndef SIGINT
+#define SIGINT 2
+#endif
+#ifndef SIGKILL
+#define SIGKILL 9
+#endif
+
+
/* #undef va_start */
/* #undef va_end */