summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-07 05:08:05 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-07 05:08:05 +0000
commit9dc29ddfd78c9bfb68161d1da922089ab859cbae (patch)
tree48fc6bf2aed7c8b5027a88fedd9b3e5237a4a7b7
parentd01f22ec7cf339902e82b3c27f227db5117b20ed (diff)
* win32/Makefile.sub (config.h): define FUNC_STDCALL/FUNC_CDECL.
from [ruby-dev:28970]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/Makefile.sub2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f8922f6dff..d96c8e5169 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 7 14:05:03 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (config.h): define FUNC_STDCALL/FUNC_CDECL.
+ from [ruby-dev:28970].
+
Thu Jul 6 23:30:04 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (rb_proc_times): use sysconf(_SC_CLK_TCK) value prior to
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index d1af7fde47..676f0e66ac 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -256,6 +256,8 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub
#define DEPRECATED(x) __declspec(deprecated) x
#define NOINLINE(x) __declspec(noinline) x
!endif
+#define FUNC_STDCALL(x) __stdcall x
+#define FUNC_CDECL(x) __cdecl x
#define RUBY_EXTERN extern __declspec(dllimport)
#define HAVE_DECL_SYS_NERR 1
#define HAVE_LIMITS_H 1