fix name clash with Android memory.h

libretro · Nov 24, 2014 · fbee2ab · fbee2ab
1 parent 0d845db
commit fbee2ab
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/emu/emu.h b/src/emu/emu.h
@@ -37,7 +37,7 @@
 #include "devdelegate.h"
 
 // memory and address spaces
-#include "memory.h"
+#include "emumemory.h"
 #include "addrmap.h"
 #include "memarray.h"
 

diff --git a/src/emu/memory.h → src/emu/emumemory.h b/src/emu/memory.h → src/emu/emumemory.h