aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-05 12:33:36 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-05 12:33:36 +0000
commitd7195ec5c349000b59bfde03173aa326b40441c3 (patch)
treec09966350a727e995c6c71310f8bc522e0d0c85f
parent9895f694603154679ff55b224607f45996dc3458 (diff)
downloadruby-d7195ec5c349000b59bfde03173aa326b40441c3.tar.gz
mjit.c: try changing the order of includes
Hoping to fix the AIX's build failure like: In file included from ./include/ruby/defines.h:139:0, from ./include/ruby/ruby.h:29, from ./include/ruby.h:33, from internal.h:15, from mjit.c:81: /opt/freeware/lib/gcc/powerpc-ibm-aix7.1.0.0/4.8.1/include-fixed/unistd.h:939:14: error: conflicting types for 'ftruncate64' extern int ftruncate64(int, off64_t); ^ In file included from ./include/ruby/defines.h:139:0, from ./include/ruby/ruby.h:29, from ./include/ruby.h:33, from internal.h:15, from mjit.c:81: /opt/freeware/lib/gcc/powerpc-ibm-aix7.1.0.0/4.8.1/include-fixed/unistd.h:937:14: note: previous declaration of 'ftruncate64' was here extern int ftruncate(int, off_t); ^ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--mjit.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/mjit.c b/mjit.c
index 62c876a825..d9277294bb 100644
--- a/mjit.c
+++ b/mjit.c
@@ -73,6 +73,15 @@
#define __EXTENSIONS__ 1
#endif
+#include "internal.h"
+#include "vm_core.h"
+#include "mjit.h"
+#include "version.h"
+#include "gc.h"
+#include "constant.h"
+#include "id_table.h"
+#include "ruby_assert.h"
+
#ifdef _WIN32
#include <winsock2.h>
#include <windows.h>
@@ -82,14 +91,6 @@
#include <dlfcn.h>
#endif
-#include "vm_core.h"
-#include "mjit.h"
-#include "version.h"
-#include "gc.h"
-#include "constant.h"
-#include "id_table.h"
-#include "ruby_assert.h"
-
extern void rb_native_mutex_lock(rb_nativethread_lock_t *lock);
extern void rb_native_mutex_unlock(rb_nativethread_lock_t *lock);
extern void rb_native_mutex_initialize(rb_nativethread_lock_t *lock);