Skip to content
Permalink
Browse files

Merge pull request #44 from littleguy77/master

Revert to original Glitch64 LOG macro definition.
  • Loading branch information...
richard42 committed Jan 10, 2015
2 parents 5416d79 + 384f398 commit 1b96dbf35fd74686df634a25a06d3a102c666159
Showing with 10 additions and 11 deletions.
  1. +4 −4 src/Glitch64/OGLESglitchmain.cpp
  2. +4 −4 src/Glitch64/OGLglitchmain.cpp
  3. +2 −3 src/Glitch64/glitchmain.h
@@ -254,7 +254,7 @@ void display_error()
#endif // _WIN32

#ifdef LOGGING
char out_buf[256];
char log_buf[256];
bool log_open = false;
std::ofstream log_file;

@@ -285,8 +285,8 @@ void LOG(const char *text, ...)
return;
va_list ap;
va_start(ap, text);
vsprintf(out_buf, text, ap);
log_file << out_buf;
vsprintf(log_buf, text, ap);
log_file << log_buf;
log_file.flush();
va_end(ap);
}
@@ -306,7 +306,7 @@ LogManager logManager;
#else // LOGGING
#define OPEN_LOG()
#define CLOSE_LOG()
//#define LOG
#define LOG
#endif // LOGGING

FX_ENTRY void FX_CALL
@@ -250,7 +250,7 @@ void display_error()
#endif // _WIN32

#ifdef LOGGING
char out_buf[256];
char log_buf[256];
bool log_open = false;
std::ofstream log_file;

@@ -281,8 +281,8 @@ void LOG(const char *text, ...)
return;
va_list ap;
va_start(ap, text);
vsprintf(out_buf, text, ap);
log_file << out_buf;
vsprintf(log_buf, text, ap);
log_file << log_buf;
log_file.flush();
va_end(ap);
}
@@ -302,7 +302,7 @@ LogManager logManager;
#else // LOGGING
#define OPEN_LOG()
#define CLOSE_LOG()
//#define LOG
#define LOG
#endif // LOGGING

FX_ENTRY void FX_CALL
@@ -23,7 +23,6 @@

#include <m64p_types.h>

#define LOG(...) WriteLog(M64MSG_VERBOSE, __VA_ARGS__)
#define LOGINFO(...) WriteLog(M64MSG_INFO, __VA_ARGS__)
#ifdef __cplusplus
extern "C" {
@@ -385,11 +384,11 @@ grConstantColorValueExt(GrChipID_t tmu,
#ifdef LOGGING
void OPEN_LOG();
void CLOSE_LOG();
//void LOG(const char *text, ...);
void LOG(const char *text, ...);
#else // LOGGING
#define OPEN_LOG()
#define CLOSE_LOG()
//#define LOG
#define LOG
#endif // LOGGING

#endif

0 comments on commit 1b96dbf

Please sign in to comment.
You can’t perform that action at this time.