Skip to content

U
uniset2
Commit d1202d0e authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

[p9]: fix build

parent f9a66657
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
extensions/UWebSocketGate/UWebSocketGateSugar.h
View file @ d1202d0e
......@@ -4,12 +4,9 @@
#ifndef myinfo
#define myinfo if( mylog->debugging(Debug::INFO) ) mylog->info()
#endif
<<<<<<< HEAD
=======
#ifndef myinfoV
#define myinfoV(N) if( mylog->debugging(Debug::INFO) ) mylog->V(N)[Debug::INFO]
#endif
>>>>>>> 2.10.1-alt1
#ifndef mywarn
#define mywarn if( mylog->debugging(Debug::WARN) ) mylog->warn()
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment