From 5d2bb536324a906078b224bdc9697b368e96a6b6 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 7 Feb 2012 12:06:03 -0500
Subject: On Linux, #undef Status: we use that name for nested LLProcess
 struct. Apparently something in the Linux system header chain #defines a
 macro Status as 'int'. That's just Bad in C++ land. It should at the very
 least be a typedef! #undefining it in llprocess.h permits the viewer to
 build.

---
 indra/llcommon/llprocess.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra')

diff --git a/indra/llcommon/llprocess.h b/indra/llcommon/llprocess.h
index 689f8aedab..0de033c15b 100644
--- a/indra/llcommon/llprocess.h
+++ b/indra/llcommon/llprocess.h
@@ -37,6 +37,10 @@
 #if LL_WINDOWS
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>                // HANDLE (eye roll)
+#elif LL_LINUX
+#if defined(Status)
+#undef Status
+#endif
 #endif
 
 class LLProcess;
-- 
cgit v1.2.3