VirtualBox

Changeset 3629

Show
Ignore:
Timestamp:
07/16/07 14:06:30 (1 year ago)
Author:
vboxsync
Message:

The SOMETHING OS and architecture #defines are now deprecated. Instead use RT_ARCH_[X86|AMD64], RT_OS_[DARWIN|FREEBSD|L4|LINUX|NETBSD|OPENBSD|OS2|SOLARIS|WINDOWS|whatever].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Config.kmk

    r3623 r3629  
    599599# Setup the global defines and includes. 
    600600# 
    601 ## @todo PATH_CURRENT has to go, fix the places where we rely on it. 
     601# Note! The __SOMETHING__ #defines are deprecated as they violate the C/C++ specs. 
     602# 
    602603INCS += $(PATH_ROOT)/include $(PATH_OUT) 
    603604DEFS += VBOX 
    604605DEFS.debug := DEBUG DEBUG_$(subst $(subst _, ,_),_,$(USERNAME)) DEBUG_USERNAME=$(subst $(subst _, ,_),_,$(USERNAME)) 
    605606DEFS.profile = VBOX_WITH_STATISTICS 
    606 DEFS.x86     = __X86__ 
    607 DEFS.amd64   = __AMD64__ 
    608 DEFS.darwin  = __DARWIN__ 
     607DEFS.x86     = RT_ARCH_X86 __X86__ 
     608DEFS.amd64   = RT_ARCH_AMD64 __AMD64__ 
     609DEFS.darwin  = RT_OS_DARWIN __DARWIN__ 
    609610DEFS.darwin.x86 = VBOX_WITH_HYBIRD_32BIT_KERNEL 
    610 DEFS.freebsd = __FREEBSD__ 
    611 DEFS.l4      = __L4__ __L4ENV__ L4API_l4v2 ARCH_$(BUILD_TARGET_ARCH) __NO_CTYPE _FILE_OFFSET_BITS=64 
     611DEFS.freebsd = RT_OS_FREEBSD __FREEBSD__ 
     612DEFS.l4      = RT_OS_L4 __L4__ __L4ENV__ L4API_l4v2 ARCH_$(BUILD_TARGET_ARCH) __NO_CTYPE _FILE_OFFSET_BITS=64 
    612613ifeq ($(L4_API),l4v2onv4) 
    613614 DEFS.l4    += L4API_l4v2onv4 STATIC_L4_INLINE 
    614615endif 
    615 DEFS.linux   = __LINUX__ _FILE_OFFSET_BITS=64 
    616 DEFS.netbsd  = __NETBSD__ 
    617 DEFS.openbsd = __OPENBSD__ 
    618 DEFS.os2     = __OS2__ 
    619 DEFS.solaris = __SOLARIS__ 
    620 DEFS.win     = __WIN__ 
     616DEFS.linux   = RT_OS_LINUX __LINUX__ _FILE_OFFSET_BITS=64 
     617DEFS.netbsd  = RT_OS_NETBSD 
     618DEFS.openbsd = RT_OS_OPENBSD 
     619DEFS.os2     = RT_OS_OS2 __OS2__ 
     620DEFS.solaris = RT_OS_SOLARIS 
     621DEFS.win     = RT_OS_WINDOWS __WIN__ 
    621622DEFS.win.x86 = __WIN32__ 
    622623DEFS.win.amd64 = __WIN64__ 
    …… 
    22082209ifdef VBOX_USE_VCC80 
    22092210 TEMPLATE_VBOXW32GUESTR0_TOOL               = VCC80X86 
    2210  TEMPLATE_VBOXW32GUESTR0_CXXFLAGS           = -Zi -Zl -GR- -GS- -EHs-c- -GF- -Gz -U__LINUX__ -U__OS2__ -W3 -wd4996 -Zc:wchar_t- 
     2211 TEMPLATE_VBOXW32GUESTR0_CXXFLAGS           = -Zi -Zl -GR- -GS- -EHs-c- -GF- -Gz -U__LINUX__ -W3 -wd4996 -Zc:wchar_t- 
    22112212 TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.debug     = -GR- -EHs-c- -Zl 
    22122213 TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.release   = -O2 -Oy- 
    22132214else 
    22142215 TEMPLATE_VBOXW32GUESTR0_TOOL               = VCC70 
    2215  TEMPLATE_VBOXW32GUESTR0_CXXFLAGS           = -Zi -Zl -GR- -GX- -GF- -Gz -U__LINUX__ -U__OS2__ -W3 
     2216 TEMPLATE_VBOXW32GUESTR0_CXXFLAGS           = -Zi -Zl -GR- -GX- -GF- -Gz -U__LINUX__ -W3 
    22162217 TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.debug     = -GR- -GX- -Zl 
    22172218 TEMPLATE_VBOXW32GUESTR0_CXXFLAGS.release   = -Ogitb2 -Oy- 
    …… 
    24532454        $(QUIET)$(MKDIR) -p $(@D) 
    24542455        $(QUIET)$(RM) -f $@ $@.tmp 
    2455         $(QUIET)$(APPEND) $@.tmp "#ifndef __version_generated_h__" 
    2456         $(QUIET)$(APPEND) $@.tmp "#define __version_generated_h__" 
     2456        $(QUIET)$(APPEND) $@.tmp "#ifndef ___version_generated_h___" 
     2457        $(QUIET)$(APPEND) $@.tmp "#define ___version_generated_h___" 
    24572458        $(QUIET)$(APPEND) $@.tmp "" 
    24582459        $(QUIET)$(APPEND) $@.tmp "#define VBOX_VERSION_MAJOR $(VBOX_VERSION_MAJOR)" 

  • trunk/include/iprt/alloca.h

    r3092 r3629  
    2222#define __iprt_alloca_h__ 
    2323 
    24  
    2524/* 
    2625 * If there are more difficult platforms out there, we'll do OS 
    …… 
    3029 * interesting of course... 
    3130 */ 
    32 #if defined(IN_RING0) && defined(__LINUX__) 
     31#if defined(IN_RING0) && defined(RT_OS_LINUX) 
    3332/* ASSUMES GNU C */ 
    3433# define alloca(cb) __builtin_alloca(cb) 
    3534#else 
    3635# include <stdlib.h> 
    37 # if !defined(__DARWIN__) && !defined(__FREEBSD__) 
     36# if !defined(RT_OS_DARWIN) && !defined(RT_OS_FREEBSD) 
    3837#  include <malloc.h> 
    3938# endif 
    40 # ifdef __SOLARIS__ 
     39# ifdef RT_OS_SOLARIS 
    4140#  include <alloca.h> 
    4241# endif 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy