From 5da2f7cecd8a14e5e2b48ac139354ea7b5a84c66 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sun, 28 Nov 2010 07:23:24 +0000 Subject: [PATCH] Correct an assertion. and remove an unused variable. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4060 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/src/Utilities/Linux/LnxHostSys.cpp | 2 +- pcsx2/Gif.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/common/src/Utilities/Linux/LnxHostSys.cpp b/common/src/Utilities/Linux/LnxHostSys.cpp index 8bd0630091..ffacbc9232 100644 --- a/common/src/Utilities/Linux/LnxHostSys.cpp +++ b/common/src/Utilities/Linux/LnxHostSys.cpp @@ -169,7 +169,7 @@ void HostSys::MmapResetPtr(void* base, size_t size) Munmap(base, size); void* result = MmapReservePtr(base, size); - pxAssertRel ((uptr)result != (uptr)base, pxsFmt( + pxAssertRel ((uptr)result == (uptr)base, pxsFmt( "Virtual memory decommit failed: memory at 0x%08X -> 0x%08X could not be remapped. " "This is likely caused by multi-thread memory contention.", base, (uptr)base+size )); diff --git a/pcsx2/Gif.cpp b/pcsx2/Gif.cpp index 4e9377c851..4dff6753f7 100644 --- a/pcsx2/Gif.cpp +++ b/pcsx2/Gif.cpp @@ -27,7 +27,6 @@ using std::min; // A three-way toggle used to determine if the GIF is stalling (transferring) or done (finished). // Should be a gifstate_t rather then int, but I don't feel like possibly interfering with savestates right now. static int gifstate = GIF_STATE_READY; -static bool gifempty = false; static bool gspath3done = false; @@ -716,7 +715,6 @@ void SaveStateBase::gifFreeze() Freeze( gifqwc ); Freeze( gspath3done ); Freeze( gscycles ); - //Freeze(gifempty); // Note: mfifocycles is not a persistent var, so no need to save it here. int bufsize = Path1WritePos - Path1ReadPos;