History

undo test commenting out code with preprocessor directives

Jack Atherton committed 7 years ago

Commit b91dd1e1 parent db1a1dd26 files · +7454 −7195Browse files

Showing the changes to src/core/chuck_errmsg.cpp (1 of 26 files). Show all

Unified · Split

src/core/chuck_errmsg.cpp+12−5
@@ -38,8 +38,9 @@ · 37 unmodified lines
3838 #include <iostream>
3939 #include "chuck_utils.h"
4040 #include "chuck_errmsg.h"
41−//#include "util_thread.h"
42−
41+#ifndef __DISABLE_THREADS__
42+#include "util_thread.h"
43+#endif
4344
4445 // global
4546 int EM_tokPos = 0;
@@ -57,7 +58,9 @@ static size_t g_lasterrorIndex = strlen(g_lasterror); · 11 unmodified lines
5758 // log globals
5859 t_CKINT g_loglevel = CK_LOG_CORE;
5960 t_CKINT g_logstack = 0;
60−//XMutex g_logmutex;
61+#ifndef __DISABLE_THREADS__
62+XMutex g_logmutex;
63+#endif
6164
6265 // more local globals
6366 static const size_t g_buffer2_size = 1024;
@@ -574,7 +577,9 @@ void EM_log( t_CKINT level, const char * message, ... ) · 510 unmodified lines
574577 // check level
575578 if( level > g_loglevel ) return;
576579
577−// g_logmutex.acquire();
580+ #ifndef __DISABLE_THREADS__
581+ g_logmutex.acquire();
582+ #endif
578583 CK_FPRINTF_STDERR( "[chuck]:" );
579584 CK_FPRINTF_STDERR( "(%i:%s): ", level, g_str[level] );
580585
@@ -588,7 +593,9 @@ void EM_log( t_CKINT level, const char * message, ... ) · 7 unmodified lines
588593
589594 CK_FPRINTF_STDERR( "\n" );
590595 CK_FFLUSH_STDERR();
591−// g_logmutex.release();
596+ #ifndef __DISABLE_THREADS__
597+ g_logmutex.release();
598+ #endif
592599 }
593600
594601

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t