From 783e86990ce6318ce65fe11e62c3a1c9fbd99e15 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Tue, 31 Jul 2012 19:42:15 +0200 Subject: [PATCH] Compile fixes --- indra/cwdebug/debug.h | 6 +++--- indra/llmessage/aicurlthread.cpp | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h index 51fd95914..0599d0598 100644 --- a/indra/cwdebug/debug.h +++ b/indra/cwdebug/debug.h @@ -81,12 +81,12 @@ struct libcwd_do_type { void on() const { } }; extern CWD_API libcwd_do_type const libcw_do; -struct CWD_API Indent { +struct Indent { int M_indent; static AI_THREADLOCAL int S_indentation; enum print_nt { print }; - Indent(int indent) : M_indent(indent) { S_indentation += M_indent; } - ~Indent() { S_indentation -= M_indent; } + CWD_API Indent(int indent) : M_indent(indent) { S_indentation += M_indent; } + CWD_API ~Indent() { S_indentation -= M_indent; } friend CWD_API std::ostream& operator<<(std::ostream& os, print_nt); }; diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp index c5348125b..ea1c4b5ba 100644 --- a/indra/llmessage/aicurlthread.cpp +++ b/indra/llmessage/aicurlthread.cpp @@ -39,7 +39,11 @@ #endif #include -#define DEBUG_WINDOWS_CODE_ON_LINUX 1 +// On linux, add -DDEBUG_WINDOWS_CODE_ON_LINUX to test the windows code used in this file. +#if !defined(DEBUG_WINDOWS_CODE_ON_LINUX) || !defined(LL_LINUX) || defined(LL_RELEASE) +#undef DEBUG_WINDOWS_CODE_ON_LINUX +#define DEBUG_WINDOWS_CODE_ON_LINUX 0 +#endif #if DEBUG_WINDOWS_CODE_ON_LINUX