From 39a70abf71232f29d4717f95691722e2cf93024f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 8 Dec 2014 21:26:40 +0100
Subject: [PATCH] Backport some stuff in this commit -
 https://github.com/libretro/fceu-next/commit/aea20914a6734f82a0962c8b3204f54c1d06f671

---
 src/drivers/libretro/fceu/fceu.c  | 5 +----
 src/drivers/libretro/fceu/video.c | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/drivers/libretro/fceu/fceu.c b/src/drivers/libretro/fceu/fceu.c
index 64ff824..5014fba 100644
--- a/src/drivers/libretro/fceu/fceu.c
+++ b/src/drivers/libretro/fceu/fceu.c
@@ -230,7 +230,6 @@ int NSFLoad(FCEUFILE *fp);
 FCEUGI *FCEUI_LoadGame(const char *name)
 {
    FCEUFILE *fp;
-   char *ipsfn;
 
    ResetGameLoaded();
 
@@ -250,9 +249,7 @@ FCEUGI *FCEUI_LoadGame(const char *name)
 
    GetFileBase(name);
 
-   ipsfn = FCEU_MakeFName(FCEUMKF_IPS, 0, 0);
-   fp = FCEU_fopen(name, ipsfn, "rb", 0);
-   free(ipsfn);
+   fp = FCEU_fopen(name, NULL, "rb", 0);
 
    if (!fp) {
       FCEU_PrintError("Error opening \"%s\"!", name);
diff --git a/src/drivers/libretro/fceu/video.c b/src/drivers/libretro/fceu/video.c
index c801778..076579a 100644
--- a/src/drivers/libretro/fceu/video.c
+++ b/src/drivers/libretro/fceu/video.c
@@ -55,8 +55,8 @@ int FCEU_InitVirtualVideo(void)
 
    if (sizeof(uint8*) == 4)
    {
-      uint32 m;
-      m = *XBuf;
+      uintptr_t m;
+      m = (uintptr_t)*XBuf;
       m = (4 - m) & 3;
       XBuf += m;
    }