Index: bcc32/Makefile.sub
===================================================================
RCS file: /cvs/ruby/src/ruby/bcc32/Makefile.sub,v
retrieving revision 1.76
diff -U2 -p -r1.76 Makefile.sub
--- bcc32/Makefile.sub	13 May 2005 14:44:41 -0000	1.76
+++ bcc32/Makefile.sub	16 May 2005 04:17:45 -0000
@@ -236,4 +236,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)bcc32/M
 \#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
Index: win32/Makefile.sub
===================================================================
RCS file: /cvs/ruby/src/ruby/win32/Makefile.sub,v
retrieving revision 1.95
diff -U2 -p -r1.95 Makefile.sub
--- win32/Makefile.sub	14 May 2005 14:57:04 -0000	1.95
+++ win32/Makefile.sub	16 May 2005 03:24:46 -0000
@@ -230,4 +230,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/
 #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
Index: win32/win32.h
===================================================================
RCS file: /cvs/ruby/src/ruby/win32/win32.h,v
retrieving revision 1.63
diff -U2 -p -r1.63 win32.h
--- win32/win32.h	15 May 2005 18:36:56 -0000	1.63
+++ win32/win32.h	16 May 2005 03:28:00 -0000
@@ -70,7 +70,4 @@ extern "C++" {
 #endif
 
-#define rb_pid_t int
-#define rb_gid_t int
-#define rb_uid_t int
 #define WNOHANG -1
 
Index: wince/Makefile.sub
===================================================================
RCS file: /cvs/ruby/src/ruby/wince/Makefile.sub,v
retrieving revision 1.39
diff -U2 -p -r1.39 Makefile.sub
--- wince/Makefile.sub	14 May 2005 14:57:04 -0000	1.39
+++ wince/Makefile.sub	16 May 2005 03:25:36 -0000
@@ -232,4 +232,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/wince/
 #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