diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-08-28 02:39:29 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-08-28 02:39:29 +0000 |
| commit | 72262b394597d4b629c6515bc2178091b86d1452 (patch) | |
| tree | b174b12dba3fcee7dc2162d7d13df4d88b8377e9 | |
| parent | 086c14c23bd27b3e7826c5d6da4af2eddbd62635 (diff) | |
| download | ruby-72262b394597d4b629c6515bc2178091b86d1452.tar.gz ruby-72262b394597d4b629c6515bc2178091b86d1452.tar.xz ruby-72262b394597d4b629c6515bc2178091b86d1452.zip | |
* win32/win32.h: define SIGINT and SIGKILL if not defined.
* win32/win32.c: remove definition of SIGINT and SIGKILL.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | win32/win32.c | 7 | ||||
| -rw-r--r-- | win32/win32.h | 9 |
3 files changed, 15 insertions, 7 deletions
@@ -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 d10b68fbe..e9edfdfc1 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 c5873c62b..b33d075e6 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 */ |