Use a better (still bad) way to fix VC's compile error from Ruby's #define inline __inline

This commit is contained in:
chosenofbear 2015-06-18 15:41:32 -04:00
parent b8734ba3ad
commit 0a6ede669b
4 changed files with 8 additions and 6 deletions

View File

@ -20,11 +20,11 @@
*/ */
#include "binding.h" #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 "sharedstate.h"
#include "eventthread.h" #include "eventthread.h"
#include "filesystem.h" #include "filesystem.h"
#include "util.h"
#include "sdl-util.h" #include "sdl-util.h"
#include "debugwriter.h" #include "debugwriter.h"
#include "graphics.h" #include "graphics.h"

View File

@ -19,11 +19,11 @@
** along with mkxp. If not, see <http://www.gnu.org/licenses/>. ** 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 "sharedstate.h"
#include "exception.h" #include "exception.h"
#include "util.h"
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>

View File

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

View File

@ -19,10 +19,11 @@
** along with mkxp. If not, see <http://www.gnu.org/licenses/>. ** 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 "sharedstate.h"
#include "filesystem.h" #include "filesystem.h"
#include "util.h"
#include "ruby/encoding.h" #include "ruby/encoding.h"
#include "ruby/intern.h" #include "ruby/intern.h"