wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 726794: clean up some WTF Platform.h macros, r=dvander

Browse Source 
--HG--
extra : rebase_source : 1969660fdeda9c426c9e37a68fc067786ef79d58
This commit is contained in:
David Mandelin 2012-03-16 17:02:52 -07:00
parent 8a370df06f
commit 6ab5b174aa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/assembler/assembler/MacroAssemblerARM.cpp
View File

@ -56,7 +56,7 @@ namespace JSC {
static bool isVFPPresent()
{
#if WTF_PLATFORM_LINUX
#if WTF_OS_LINUX
int fd = open("/proc/self/auxv", O_RDONLY);
if (fd > 0) {
Elf32_auxv_t aux;

6
js/src/assembler/wtf/Assertions.h
View File

@ -70,7 +70,7 @@
#include <inttypes.h>
#endif
#if WTF_PLATFORM_SYMBIAN
#if WTF_OS_SYMBIAN
#include <e32def.h>
#include <e32debug.h>
#endif
@ -145,7 +145,7 @@ void WTFLogVerbose(const char* file, int line, const char* function, WTFLogChann
/* CRASH -- gets us into the debugger or the crash reporter -- signals are ignored by the crash reporter so we must do better */
#ifndef CRASH
#if WTF_PLATFORM_SYMBIAN
#if WTF_OS_SYMBIAN
#define CRASH() do { \
__DEBUGGER(); \
User::Panic(_L("Webkit CRASH"),0); \
@ -160,7 +160,7 @@ void WTFLogVerbose(const char* file, int line, const char* function, WTFLogChann
/* ASSERT, ASSERT_WITH_MESSAGE, ASSERT_NOT_REACHED */
#if WTF_PLATFORM_WIN_OS || WTF_PLATFORM_SYMBIAN
#if WTF_PLATFORM_WIN || WTF_OS_SYMBIAN
/* FIXME: Change to use something other than ASSERT to avoid this conflict with the underlying platform */
#undef ASSERT
#endif