k0kubun	2018-02-05 21:33:36 +0900 (Mon, 05 Feb 2018)

  New Revision: 62227

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62227

  Log:
    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);
                  ^

  Modified files:
    trunk/mjit.c
Index: mjit.c
===================================================================
--- mjit.c	(revision 62226)
+++ mjit.c	(revision 62227)
@@ -73,6 +73,15 @@ https://github.com/ruby/ruby/blob/trunk/mjit.c#L73
 #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 @@ https://github.com/ruby/ruby/blob/trunk/mjit.c#L91
 #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);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/