Changeset 64625 in vbox for trunk/src/libs/xpcom18a4/xpcom/base

Timestamp:

Nov 10, 2016 9:34:47 AM (8 years ago)

Author:

vboxsync

Message:

xpcom: Explicitly don't compile this code even if 'linux' is defined. 'linux' is not pre-defined by gcc if the source code is compiled with '-ansi' -- like done in our context. This change fixes compiling with Parfait which isn't aware of this condition.

Location:

trunk/src/libs/xpcom18a4/xpcom/base

Files:

• nsStackFrameUnix.cpp (modified) (1 diff)
• nsTraceRefcntImpl.cpp (modified) (2 diffs)

trunk/src/libs/xpcom18a4/xpcom/base/nsStackFrameUnix.cpp

@@ -84 +84 @@
 
 
-#if defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
+#if defined(linux) && !defined(VBOX) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
 
 #include <setjmp.h>

trunk/src/libs/xpcom18a4/xpcom/base/nsTraceRefcntImpl.cpp

@@ -51 +51 @@
 #if defined(_WIN32)
 #include <windows.h>
-#elif defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))
+#elif defined(linux) && !defined(VBOX) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))
 #include <setjmp.h>
 
@@ -859 +859 @@
 // WIN32 x86 stack walking code
 // i386 or PPC Linux stackwalking code or Solaris
-#elif (defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
+#elif (defined(linux) && !defined(VBOX) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
 #include "nsStackFrameUnix.h"
 void