Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Restore a log statement, #pragma once.

Browse source
This commit is contained in:
Henrik Rydgard 2013-03-07 00:27:00 +01:00
parent a69b09a831
commit a0cf3b9151
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Core/HLE/sceIo.cpp
View file

@ -860,13 +860,14 @@ u32 sceIoDevctl(const char *name, int cmd, u32 argAddr, int argLen, u32 outPtr,
case 2: // EMULATOR_DEVCTL__SEND_OUTPUT case 2: // EMULATOR_DEVCTL__SEND_OUTPUT
{ {
std::string data(Memory::GetCharPointer(argAddr), argLen); std::string data(Memory::GetCharPointer(argAddr), argLen);
if (PSP_CoreParameter().printfEmuLog) if (PSP_CoreParameter().printfEmuLog) {
{
host->SendDebugOutput(data.c_str()); host->SendDebugOutput(data.c_str());
} } else {
if (PSP_CoreParameter().collectEmuLog) if (PSP_CoreParameter().collectEmuLog) {
{
*PSP_CoreParameter().collectEmuLog += data; *PSP_CoreParameter().collectEmuLog += data;
} else if (PSP_CoreParameter().collectEmuLog) {
DEBUG_LOG(HLE, "%s", data.c_str());
}
} }
return 0; return 0;
} }

2
android/jni/TestRunner.h
View file

@ -15,4 +15,6 @@
// Official git repository and contact information can be found at // Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#pragma once
void RunTests(); void RunTests();