diff options
Diffstat (limited to 'linden/indra/llcommon/llpreprocessor.h')
-rw-r--r-- | linden/indra/llcommon/llpreprocessor.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h index 8bcad34..8d38904 100644 --- a/linden/indra/llcommon/llpreprocessor.h +++ b/linden/indra/llcommon/llpreprocessor.h | |||
@@ -52,33 +52,6 @@ | |||
52 | #define LL_FORCE_INLINE __forceinline | 52 | #define LL_FORCE_INLINE __forceinline |
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | // Per-OS feature switches. | ||
56 | |||
57 | #if LL_DARWIN | ||
58 | #define LL_QUICKTIME_ENABLED 1 | ||
59 | #define LL_LIBXUL_ENABLED 1 | ||
60 | #elif LL_WINDOWS | ||
61 | #define LL_QUICKTIME_ENABLED 1 | ||
62 | #define LL_LIBXUL_ENABLED 1 | ||
63 | #elif LL_LINUX | ||
64 | #define LL_QUICKTIME_ENABLED 0 | ||
65 | #ifndef LL_LIBXUL_ENABLED | ||
66 | #define LL_LIBXUL_ENABLED 1 | ||
67 | #endif // def LL_LIBXUL_ENABLED | ||
68 | #elif LL_SOLARIS | ||
69 | #define LL_QUICKTIME_ENABLED 0 | ||
70 | #ifndef LL_LIBXUL_ENABLED | ||
71 | #define LL_LIBXUL_ENABLED 0 | ||
72 | #endif // def LL_LIBXUL_ENABLED | ||
73 | #endif | ||
74 | |||
75 | #if LL_LIBXUL_ENABLED && !defined(MOZILLA_INTERNAL_API) | ||
76 | // Without this, nsTAString.h errors out with: | ||
77 | // "Cannot use internal string classes without MOZILLA_INTERNAL_API defined. Use the frozen header nsStringAPI.h instead." | ||
78 | // It might be worth our while to figure out if we can use the frozen apis at some point... | ||
79 | #define MOZILLA_INTERNAL_API 1 | ||
80 | #endif | ||
81 | |||
82 | // Figure out differences between compilers | 55 | // Figure out differences between compilers |
83 | #if defined(__GNUC__) | 56 | #if defined(__GNUC__) |
84 | #define GCC_VERSION (__GNUC__ * 10000 \ | 57 | #define GCC_VERSION (__GNUC__ * 10000 \ |