diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-09-08 08:12:22 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-09-08 08:12:22 (GMT) |
| commit | 790d6d4dda03314cccf4cad0bf32d9d8c3da4980 (patch) | |
| tree | ef3b66681c7f57da5115de76442514820c47b57e /src/3rdparty | |
| parent | b555f500f4ff2898b3dc7082590773132a1030f1 (diff) | |
| download | Qt-790d6d4dda03314cccf4cad0bf32d9d8c3da4980.zip Qt-790d6d4dda03314cccf4cad0bf32d9d8c3da4980.tar.gz Qt-790d6d4dda03314cccf4cad0bf32d9d8c3da4980.tar.bz2 | |
make JavaScriptCore compile on platforms with case-insensitive file system
There's a clash between "TypeInfo.h" and a standard header "typeinfo.h"
that's included from a place we don't control. The fix is to rename
"TypeInfo.h" to "JSTypeInfo.h".
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSTypeInfo.h (renamed from src/3rdparty/webkit/JavaScriptCore/runtime/TypeInfo.h) | 6 | ||||
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi index 2d69c7d..5a75ab7 100644 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi @@ -323,7 +323,7 @@ 'runtime/TimeoutChecker.cpp', 'runtime/TimeoutChecker.h', 'runtime/Tracing.h', - 'runtime/TypeInfo.h', + 'runtime/JSTypeInfo.h', 'runtime/UString.cpp', 'runtime/UString.h', 'wrec/CharacterClass.cpp', diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/TypeInfo.h b/src/3rdparty/webkit/JavaScriptCore/runtime/JSTypeInfo.h index 70aeed3..bea188b 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/TypeInfo.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSTypeInfo.h @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef TypeInfo_h -#define TypeInfo_h +#ifndef JSTypeInfo_h +#define JSTypeInfo_h #include "JSType.h" @@ -69,4 +69,4 @@ namespace JSC { } -#endif // TypeInfo_h +#endif // JSTypeInfo_h diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h b/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h index dcd4e50..ca4552b 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h @@ -31,7 +31,7 @@ #include "JSValue.h" #include "PropertyMapHashTable.h" #include "StructureTransitionTable.h" -#include "TypeInfo.h" +#include "JSTypeInfo.h" #include "UString.h" #include <wtf/PassRefPtr.h> #include <wtf/RefCounted.h> |