summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-11-27 04:38:59 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-11-27 04:38:59 +0000
commit2aef6a6a05384c7eb5e01fc5144a893f5aeb853c (patch)
tree028c8be0864843cd09bd222a480c4a2d685b7e84
parent23e88ba603c6e16ebcd63d841be8258a60097ac6 (diff)
downloadpcsxr-2aef6a6a05384c7eb5e01fc5144a893f5aeb853c.tar.gz
Minor changes.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87983 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rwxr-xr-xmacosx/main.m23
1 files changed, 5 insertions, 18 deletions
diff --git a/macosx/main.m b/macosx/main.m
index 60a6fd19..bda97ec4 100755
--- a/macosx/main.m
+++ b/macosx/main.m
@@ -10,8 +10,7 @@
#import "PcsxrController.h"
#import "ConfigurationController.h"
#include <dlfcn.h>
-//#import <sys/param.h>
-#import <unistd.h>
+#include <unistd.h>
#include "psxcommon.h"
#include "sio.h"
#include <IOKit/pwr_mgt/IOPMLib.h>
@@ -119,20 +118,6 @@ void SysReset()
//EmuReset();
}
-#ifdef EMU_LOG
-#ifndef LOG_STDOUT
-static inline NSDateFormatter* debugDateFormatter()
-{
- static NSDateFormatter* theFormatter = nil;
- if (theFormatter == nil) {
- theFormatter = [[NSDateFormatter alloc] init];
- [theFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss:SSS"];
- }
- return theFormatter;
-}
-#endif
-#endif
-
static void AddStringToLogList(const char *themsg)
{
static NSMutableString *theStr;
@@ -164,10 +149,12 @@ void SysPrintf(const char *fmt, ...)
va_end(list);
RunOnMainThreadSync(^{
- if (Config.PsxOut) AddStringToLogList(msg);
+ if (Config.PsxOut)
+ AddStringToLogList(msg);
#ifdef EMU_LOG
#ifndef LOG_STDOUT
- if (emuLog) fprintf(emuLog, "%s", msg);
+ if (emuLog)
+ fprintf(emuLog, "%s", msg);
#endif
#endif
});