Second Life viewer sources 1.21.0-RC

1 files changed, 5 insertions, 2 deletions

diff --git a/linden/indra/llmessage/lliopipe.h b/linden/indra/llmessage/lliopipe.h
index 97c6246..a451dd7 100644
--- a/linden/indra/llmessage/lliopipe.h
+++ b/linden/indra/llmessage/lliopipe.h
@@ -36,7 +36,7 @@
 
 #include <boost/intrusive_ptr.hpp>
 #include <boost/shared_ptr.hpp>
-#include "apr-1/apr_poll.h"
+#include "apr_poll.h"
 
 #include "llsd.h"
 
@@ -46,11 +46,14 @@ class LLBufferArray;
 class LLChannelDescriptors;
 
 // Debugging schmutz for deadlocks
-#define LL_DEBUG_PUMPS
+//#define LL_DEBUG_PUMPS
 #ifdef LL_DEBUG_PUMPS
 void pump_debug(const char *file, S32 line);
 #define PUMP_DEBUG pump_debug(__FILE__, __LINE__);
 #define END_PUMP_DEBUG pump_debug("none", 0);
+#else /* LL_DEBUG_PUMPS */
+#define PUMP_DEBUG
+#define END_PUMP_DEBUG
 #endif