binding-mri/binding-mri.cpp

@@ -20,11 +20,11 @@
 */
 
 #include "binding.h"
-#include "util.h"
+#include "binding-util.h"
-#include "binding-util.h"  //fatal error C1189 if this is before "util.h"
 #include "sharedstate.h"
 #include "eventthread.h"
 #include "filesystem.h"
+#include "util.h"
 #include "sdl-util.h"
 #include "debugwriter.h"
 #include "graphics.h"

binding-mri/binding-util.cpp

@@ -19,11 +19,11 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "util.h"
+#include "binding-util.h"
-#include "binding-util.h" //fatal error C1189 if this is before "util.h"
 
 #include "sharedstate.h"
 #include "exception.h"
+#include "util.h"
 
 #include <stdarg.h>
 #include <string.h>

binding-mri/binding-util.h

@@ -23,6 +23,7 @@
 #define BINDING_UTIL_H
 
 #include <ruby.h>
+#undef inline //ruby's config.h has #define inline __inline, which cause error in xkeycheck.h
 
 #include "exception.h"
 

binding-mri/filesystem-binding.cpp

@@ -19,10 +19,11 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "util.h"
+#include "binding-util.h"
-#include "binding-util.h" //fatal error C1189 if this is before "util.h"
+
 #include "sharedstate.h"
 #include "filesystem.h"
+#include "util.h"
 
 #include "ruby/encoding.h"
 #include "ruby/intern.h"