summaryrefslogtreecommitdiffstats
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
commit58cbe8ff0b3a05e4e56d2199e33b8fc01f0d7108 (patch)
tree46a488ce6c6f76a01511d9e912d4b6fe3b21ca34 /win32
parent66126dee53a44315cf1c0c036e1af0076834e6e0 (diff)
downloadruby-58cbe8ff0b3a05e4e56d2199e33b8fc01f0d7108.tar.gz
ruby-58cbe8ff0b3a05e4e56d2199e33b8fc01f0d7108.tar.xz
ruby-58cbe8ff0b3a05e4e56d2199e33b8fc01f0d7108.zip
* win32/win32.h, {bcc32,win32,wince}/Makefile.sub: moved rb_[ugp]id_t
to get rid of redefinition warnings on mingw. git-svn-id: http://svn.ruby-lang.org/repos/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 ad18e9c89..85304f896 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 efbef04bd..f07304807 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