diff options
| -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 03:29:01 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 d8228a26d3..0e4a1607c8 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -235,6 +235,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 ad18e9c89a..85304f8968 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -229,6 +229,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 efbef04bdd..f073048074 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 4e5007a22d..3be25abc6a 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -231,6 +231,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 |