diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-02-07 12:06:03 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-02-07 12:06:03 -0500 |
| commit | 5d2bb536324a906078b224bdc9697b368e96a6b6 (patch) | |
| tree | e8c181ab779bd85ab9e766cd4a8c55f26c829d82 | |
| parent | 219a010aaf4891fc2ab8480a2121b1244191c24d (diff) | |
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.
| -rw-r--r-- | indra/llcommon/llprocess.h | 4 |
1 files changed, 4 insertions, 0 deletions
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; |