summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-16 13:22:09 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-16 13:22:09 +0000
commita3c29ec51ac19043859728696f568b095ac739e6 (patch)
tree46a488ce6c6f76a01511d9e912d4b6fe3b21ca34 /win32
parent208f2f27ca2604b37125f66585933807759dff99 (diff)
downloadruby-a3c29ec51ac19043859728696f568b095ac739e6.tar.gz
* 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/trunk@8468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub3
-rw-r--r--win32/win32.h3
2 files changed, 3 insertions, 3 deletions
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