ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed linux compilation issues

This commit is contained in:
qeed 2009-10-10 23:12:21 +00:00
parent 6d75c9ce0d
commit 5a2750d160
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fceu.cpp
View File

@ -238,11 +238,9 @@ readfunc GetReadHandler(int32 a)
else else
return ARead[a]; return ARead[a];
} }
void SetReadHandler(int32 start, int32 end, readfunc func) void SetReadHandler(int32 start, int32 end, readfunc func)
{ {
int32 x; int32 x;
if(!func) if(!func)
func=ANull; func=ANull;
@ -482,7 +480,9 @@ endlseq:
if(GameInfo->type!=GIT_NSF) if(GameInfo->type!=GIT_NSF)
FCEU_LoadGameCheats(0); FCEU_LoadGameCheats(0);
#if defined (WIN32) || defined (WIN64)
DoDebuggerRunCheck(); //Can't safely do it in loadPreferences DoDebuggerRunCheck(); //Can't safely do it in loadPreferences
#endif
return GameInfo; return GameInfo;
} }
@ -1152,4 +1152,4 @@ uint8 FCEU_ReadRomByte(uint32 i) {
if(i < 16+PRGsize[0])return PRGptr[0][i-16]; if(i < 16+PRGsize[0])return PRGptr[0][i-16];
if(i < 16+PRGsize[0]+CHRsize[0])return CHRptr[0][i-16-PRGsize[0]]; if(i < 16+PRGsize[0]+CHRsize[0])return CHRptr[0][i-16-PRGsize[0]];
return 0; return 0;
} }

2
src/lua-engine.cpp
View File

@ -2179,7 +2179,7 @@ void HandleCallbackError(lua_State* L)
#ifdef WIN32 #ifdef WIN32
MessageBox( hAppWnd, lua_tostring(L,-1), "Lua run error", MB_OK | MB_ICONSTOP); MessageBox( hAppWnd, lua_tostring(L,-1), "Lua run error", MB_OK | MB_ICONSTOP);
#else #else
fprintf(stderr, "Lua thread bombed out: %s\n", lua_tostring(LUA,-1)); fprintf(stderr, "Lua thread bombed out: %s\n", lua_tostring(L,-1));
#endif #endif
FCEU_LuaStop(); FCEU_LuaStop();