VirtualBox

Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/libs/xpcom18a4/xpcom/base/nsStackFrameUnix.cpp

    r1 r64625  
    8484
    8585
    86 #if defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
     86#if defined(linux) && !defined(VBOX) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
    8787
    8888#include <setjmp.h>
  • trunk/src/libs/xpcom18a4/xpcom/base/nsTraceRefcntImpl.cpp

    r49550 r64625  
    5151#if defined(_WIN32)
    5252#include <windows.h>
    53 #elif defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))
     53#elif defined(linux) && !defined(VBOX) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))
    5454#include <setjmp.h>
    5555
     
    859859// WIN32 x86 stack walking code
    860860// i386 or PPC Linux stackwalking code or Solaris
    861 #elif (defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
     861#elif (defined(linux) && !defined(VBOX) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
    862862#include "nsStackFrameUnix.h"
    863863void
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette