summaryrefslogtreecommitdiff
path: root/win32/config.h.in
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-03-20 11:21:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-03-20 11:21:19 +0000
commitc92a934c110b6759f3d6b4a547f2987fac293e0b (patch)
treef081ee70ed6379ad49252314ea5c57c28e7955f0 /win32/config.h.in
parent3adfc84e73c492b7f19e65e5578b21e673273afe (diff)
* win32/Makefile.sub: made variables configurable.
* win32/Makefile.sub (config.h): updates RUBY_PLATFORM from Makefile. * win32/Makefile.sub (config.status): ditto. * win32/Makefile.sub (clean): separate ext and local clean up. * win32/Makefile.sub (distclean): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/config.h.in')
-rw-r--r--win32/config.h.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/win32/config.h.in b/win32/config.h.in
index 22073b0d148..870845b1a6f 100644
--- a/win32/config.h.in
+++ b/win32/config.h.in
@@ -3,7 +3,10 @@
/* #define HAVE_ATTR_NORETURN 1 */
#if _MSC_VER > 1100 && !defined NORETURN
#define NORETURN(x) __declspec(noreturn) x
+#else
+#define NORETURN(x) x
#endif
+#define TOKEN_PASTE(x,y) x##y
#define inline __inline
/* #define HAVE_DIRENT_H 1 */
/* #define HAVE_UNISTD_H 1 */
@@ -44,6 +47,7 @@
#define RSHIFT(x,y) ((x)>>y)
#define FILE_COUNT _cnt
+#define FILE_READPTR _ptr
#define DEFAULT_KCODE KCODE_NONE
#define DLEXT ".so"
#define DLEXT2 ".dll"
@@ -51,8 +55,8 @@
#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/1.7"
#define RUBY_PLATFORM "i586-mswin32"
-#define RUBY_ARCHLIB "/lib/ruby/1.7/i586-mswin32"
-#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.7/i586-mswin32"
+#define RUBY_ARCHLIB "/lib/ruby/1.7/" RUBY_PLATFORM
+#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.7/" RUBY_PLATFORM
#define SIZEOF_INT 4
#define SIZEOF_SHORT 2