diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-19 12:39:09 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-19 12:39:09 +0000 |
| commit | dbef5ecd7aa11e623a2ed9f99ffa77616b5ae1d1 (patch) | |
| tree | 29cc430d576af0e319eb756c47f7138dd30cfa82 | |
| parent | 21ecf88ce0bb50dd2014a78e41c78db48f7b0bff (diff) | |
* include/ruby/defines.h: Fix a compilation error with
i586-mingw32msvc-gcc of gcc-mingw32 package on Debian squeeze.
ruby/missing.h should be included before include/ruby/win32.h
because struct timespec, used in the clock_gettime declaration in
include/ruby/win32.h, is defined in ruby/missing.h instead of
system headers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | include/ruby/defines.h | 2 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 1 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,12 @@ +Mon Aug 19 21:31:35 2013 Tanaka Akira <akr@fsij.org> + + * include/ruby/defines.h: Fix a compilation error with + i586-mingw32msvc-gcc of gcc-mingw32 package on Debian squeeze. + ruby/missing.h should be included before include/ruby/win32.h + because struct timespec, used in the clock_gettime declaration in + include/ruby/win32.h, is defined in ruby/missing.h instead of + system headers. + Mon Aug 19 20:55:12 2013 Koichi Sasada <ko1@atdot.net> * gc.c: fix around GC_DEBUG. diff --git a/include/ruby/defines.h b/include/ruby/defines.h index cb3e21002a..3327e69123 100644 --- a/include/ruby/defines.h +++ b/include/ruby/defines.h @@ -65,6 +65,8 @@ extern "C" { #include <setjmpex.h> #endif +#include "ruby/missing.h" + #define RUBY #ifdef __cplusplus diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index abcc73b5b3..ad0c30af41 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1736,7 +1736,6 @@ rb_special_const_p(VALUE obj) } #endif -#include "ruby/missing.h" #include "ruby/intern.h" #if defined(EXTLIB) && defined(USE_DLN_A_OUT) |