diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-16 13:22:09 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-16 13:22:09 +0000 |
| commit | 73cc4a2cd7e1245d82125d233498999b108a1d7d (patch) | |
| tree | 2a922846ac2a8b90a1de7bd3f3b2290ecead0916 | |
| parent | 49e9468085d1a0d451703e614746bde8f81e2564 (diff) | |
* win32/win32.h, {bcc32,win32,wince}/Makefile.sub: moved rb_[ugp]id_t
to get rid of redefinition warnings on mingw.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 3 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 | ||||
| -rw-r--r-- | win32/win32.h | 3 | ||||
| -rw-r--r-- | wince/Makefile.sub | 3 |
5 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon May 16 22:21:44 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/win32.h, {bcc32,win32,wince}/Makefile.sub: moved rb_[ugp]id_t + to get rid of redefinition warnings on mingw. + Mon May 16 08:52:29 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * win32/win32.{h,c}: define rb_{p,g,u}id_t. diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 7c84aaed5a..bac20a830d 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -231,6 +231,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)bcc32/Makefile.sub \#define HAVE_FCNTL_H 1 \#define HAVE_UTIME_H 1 \#define HAVE_FLOAT_H 1 +\#define rb_uid_t uid_t +\#define rb_gid_t gid_t +\#define rb_pid_t int \#define HAVE_STRUCT_STAT_ST_RDEV 1 \#define HAVE_ST_RDEV 1 \#define GETGROUPS_T int diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 6d3e069788..16494794bf 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -221,6 +221,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub #define HAVE_FCNTL_H 1 #define HAVE_SYS_UTIME_H 1 #define HAVE_FLOAT_H 1 +#define rb_pid_t int +#define rb_gid_t int +#define rb_uid_t int #define HAVE_STRUCT_STAT_ST_RDEV 1 #define HAVE_ST_RDEV 1 #define GETGROUPS_T int diff --git a/win32/win32.h b/win32/win32.h index b41b912e8e..c73b91bda5 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -69,9 +69,6 @@ extern "C++" { } #endif -#define rb_pid_t int -#define rb_gid_t int -#define rb_uid_t int #define WNOHANG -1 #undef getc diff --git a/wince/Makefile.sub b/wince/Makefile.sub index 1930d23be8..6579705d56 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -223,6 +223,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/wince/Makefile.sub #define HAVE_FCNTL_H 1 #define HAVE_SYS_UTIME_H 1 #define HAVE_FLOAT_H 1 +#define rb_uid_t int +#define rb_gid_t int +#define rb_pid_t int #define HAVE_STRUCT_STAT_ST_RDEV 1 #define HAVE_ST_RDEV 1 #define GETGROUPS_T int |