From bb327684aa71036f4a8c7804051fdc8317e6c445 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 9 Nov 2014 20:27:51 +0100
Subject: [PATCH] Update d3d_set_osd_msg

---
 apple/iOS/Makefile | 6 +++---
 gfx/d3d/d3d.cpp    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apple/iOS/Makefile b/apple/iOS/Makefile
index 181d0fd971..d5a44d0552 100644
--- a/apple/iOS/Makefile
+++ b/apple/iOS/Makefile
@@ -47,8 +47,8 @@ COMMON_FLAGS := -DIOS -DHAVE_GRIFFIN -DHAVE_LOCATION -DHAVE_RGUI -DHAVE_MENU -DH
 COMMON_FLAGS += -DHAVE_CAMERA
 COMMON_IOS_FLAGS := -Wno-deprecated-declarations -Wno-error
 COMMON_IOS_OBJCFLAGS := -fobjc-arc 
-INCDIR       := -I$(SRC_DIR) -I$(SRC_DIR)/libretro-sdk/include
-retroarch_CFLAGS  += $(COMMON_FLAGS) $(COMMON_IOS_FLAGS) $(COMMON_IOS_OBJCFLAGS) $(INCDIR)
-retroarch_CCFLAGS += $(COMMON_FLAGS) $(COMMON_IOS_FLAGS) $(COMMON_IOS_OBJCFLAGS) $(INCDIR)
+INCFLAGS       := -I$(SRC_DIR) -I$(SRC_DIR)/libretro-sdk/include
+retroarch_CFLAGS  += $(COMMON_FLAGS) $(COMMON_IOS_FLAGS) $(COMMON_IOS_OBJCFLAGS) $(INCFLAGS)
+retroarch_CCFLAGS += $(COMMON_FLAGS) $(COMMON_IOS_FLAGS) $(COMMON_IOS_OBJCFLAGS) $(INCFLAGS)
 
 include $(THEOS_MAKE_PATH)/application.mk
diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index 317b36b72b..2974f1b220 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -461,7 +461,7 @@ static void d3d_apply_state_changes(void *data)
 }
 
 static void d3d_set_osd_msg(void *data, const char *msg,
-      const struct font_params *params)
+      const struct font_params *params, void *font)
 {
    d3d_video_t *d3d = (d3d_video_t*)data;