diff options
| author | Sergio Martins <sergio.martins@kdab.com> | 2014-04-14 22:06:50 +0100 |
|---|---|---|
| committer | Sérgio Martins <sergio.martins@kdab.com> | 2014-06-27 11:58:31 +0200 |
| commit | 24b78f24e88087dfc27e45df85df07a5253fd5ac (patch) | |
| tree | 25332b9ab78b5bd0dc23da44634a6d75166e37b1 /Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | |
| parent | b16a6f1c1caf3ee0b4fb256f6cd21aa294a0da9d (diff) | |
| download | qtwebkit-24b78f24e88087dfc27e45df85df07a5253fd5ac.tar.gz | |
Fix android build error about already defined struct.
Minimum API version is 9, which already defines this struct in elf.h
Also see qtscript/49ab1bd9838dc3c069be780ff6d69a2543c06ed6 which does
the same thing there.
Change-Id: Ia56f8399156a93edc569e7bb982bd7186a16a445
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp')
| -rw-r--r-- | Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp index 8f5a148f9..0264361b5 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp +++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp @@ -38,14 +38,6 @@ #include <elf.h> # if OS(ANDROID) && PLATFORM(QT) # include <asm/procinfo.h> -typedef struct -{ - uint32_t a_type; - union - { - uint32_t a_val; - } a_un; -} Elf32_auxv_t; # else # include <asm/hwcap.h> # endif |