aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmedia/llmediabase.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llmedia/llmediabase.h
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/llmedia/llmediabase.h19
1 files changed, 0 insertions, 19 deletions
diff --git a/linden/indra/llmedia/llmediabase.h b/linden/indra/llmedia/llmediabase.h
index 49c6d69..dad02ca 100644
--- a/linden/indra/llmedia/llmediabase.h
+++ b/linden/indra/llmedia/llmediabase.h
@@ -34,25 +34,6 @@
34#ifndef LLMEDIABASE_H 34#ifndef LLMEDIABASE_H
35#define LLMEDIABASE_H 35#define LLMEDIABASE_H
36 36
37// Per-OS feature switches.
38#if LL_DARWIN
39 #define LL_QUICKTIME_ENABLED 1
40 #define LL_LLMOZLIB_ENABLED 1
41#elif LL_WINDOWS
42 #define LL_QUICKTIME_ENABLED 1
43 #define LL_LLMOZLIB_ENABLED 1
44#elif LL_LINUX
45 #define LL_QUICKTIME_ENABLED 0
46 #ifndef LL_LLMOZLIB_ENABLED
47 #define LL_LLMOZLIB_ENABLED 1
48 #endif // def LL_LLMOZLIB_ENABLED
49#elif LL_SOLARIS
50 #define LL_QUICKTIME_ENABLED 0
51 #ifndef LL_LLMOZLIB_ENABLED
52 #define LL_LLMOZLIB_ENABLED 0
53 #endif // def LL_LLMOZLIB_ENABLED
54#endif
55
56#if LL_LLMOZLIB_ENABLED && !defined ( MOZILLA_INTERNAL_API ) 37#if LL_LLMOZLIB_ENABLED && !defined ( MOZILLA_INTERNAL_API )
57 // Without this, nsTAString.h errors out with: 38 // Without this, nsTAString.h errors out with:
58 // "Cannot use internal string classes without MOZILLA_INTERNAL_API defined. Use the frozen header nsStringAPI.h instead." 39 // "Cannot use internal string classes without MOZILLA_INTERNAL_API defined. Use the frozen header nsStringAPI.h instead."