VirtualBox

Changeset 102226 in vbox for trunk/src/libs


Ignore:
Timestamp:
Nov 22, 2023 8:55:23 AM (16 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
160351
Message:

libs/xpcom: Remove individual *.cfg files and merge relevant stuff into vbox.cfg, bugref:10545

Location:
trunk/src/libs/xpcom18a4
Files:
7 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/xpcom18a4/Config.kmk

    r102030 r102226  
    105105endif
    106106ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    107  TEMPLATE_XPComDll_DEFS.darwin        = OSTYPE="Darwin8.8.1" OSARCH="Darwin" XP_UNIX=1 XP_MACOSX=1 TARGET_CARBON=1 HAVE_VISIBILITY_ATTRIBUTE=1 DARWIN=1 $(TEMPLATE_VBoxR3DllNonPedantic_DEFS.darwin)
    108 else
    109  TEMPLATE_XPComDll_DEFS.darwin        = OSTYPE=\"Darwin8.8.1\" OSARCH=\"Darwin\" XP_UNIX=1 XP_MACOSX=1 TARGET_CARBON=1 HAVE_VISIBILITY_ATTRIBUTE=1 DARWIN=1 $(TEMPLATE_VBoxR3DllNonPedantic_DEFS.darwin)
     107 TEMPLATE_XPComDll_DEFS.darwin        = XP_UNIX=1 XP_MACOSX=1 TARGET_CARBON=1 HAVE_VISIBILITY_ATTRIBUTE=1 $(TEMPLATE_VBoxR3DllNonPedantic_DEFS.darwin)
     108else
     109 TEMPLATE_XPComDll_DEFS.darwin        = XP_UNIX=1 XP_MACOSX=1 TARGET_CARBON=1 HAVE_VISIBILITY_ATTRIBUTE=1 $(TEMPLATE_VBoxR3DllNonPedantic_DEFS.darwin)
    110110endif
    111111TEMPLATE_XPComDll_DEFS.darwin.amd64   = VBOX_MACOSX_FOLLOWS_UNIX_IO
    112112TEMPLATE_XPComDll_DEFS.darwin.arm64   = VBOX_MACOSX_FOLLOWS_UNIX_IO
    113113ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    114  TEMPLATE_XPComDll_DEFS.freebsd       = OSTYPE="FreeBSD5+"     OSARCH="FreeBSD"   XP_UNIX=1 FREEBSD=1 HAVE_VISIBILITY_ATTRIBUTE=1
    115 else
    116  TEMPLATE_XPComDll_DEFS.freebsd       = OSTYPE=\"FreeBSD5+\"   OSARCH=\"FreeBSD\" XP_UNIX=1 FREEBSD=1 HAVE_VISIBILITY_ATTRIBUTE=1
    117 endif
    118 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    119  TEMPLATE_XPComDll_DEFS.linux         = OSTYPE="Linux2.6"      OSARCH="Linux"     XP_UNIX=1 _GNU_SOURCE HAVE_VISIBILITY_ATTRIBUTE=1 ## @todo LINUX=1
    120 else
    121  TEMPLATE_XPComDll_DEFS.linux         = OSTYPE=\"Linux2.6\"    OSARCH=\"Linux\"   XP_UNIX=1 _GNU_SOURCE HAVE_VISIBILITY_ATTRIBUTE=1 ## @todo LINUX=1
    122 endif
    123 # Don't define BSD_SELECT because bsdselect() from kLIBC <= 0.6.3 has problems on SMP
    124 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    125  TEMPLATE_XPComDll_DEFS.os2           = OSTYPE="OS/2_4.5"      OSARCH="OS/2"      XP_OS2 XP_PC OS2=4
    126 else
    127  TEMPLATE_XPComDll_DEFS.os2           = OSTYPE=\"OS/2_4.5\"    OSARCH=\"OS/2\"    XP_OS2 XP_PC OS2=4
    128 endif
    129 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    130  TEMPLATE_XPComDll_DEFS.solaris       = OSTYPE="Solaris10"     OSARCH="Solaris"   XP_UNIX=1 XP_SOLARIS=1 HAVE_LIBDL=1 HAVE_SENDFILEV=1 SOLARIS=1 _REENTRANT
    131 else
    132  TEMPLATE_XPComDll_DEFS.solaris       = OSTYPE=\"Solaris10\"   OSARCH=\"Solaris\" XP_UNIX=1 XP_SOLARIS=1 HAVE_LIBDL=1 HAVE_SENDFILEV=1 SOLARIS=1 _REENTRANT
     114 TEMPLATE_XPComDll_DEFS.freebsd       = HAVE_VISIBILITY_ATTRIBUTE=1
     115else
     116 TEMPLATE_XPComDll_DEFS.freebsd       = HAVE_VISIBILITY_ATTRIBUTE=1
     117endif
     118ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
     119 TEMPLATE_XPComDll_DEFS.linux         = _GNU_SOURCE HAVE_VISIBILITY_ATTRIBUTE=1
     120else
     121 TEMPLATE_XPComDll_DEFS.linux         = _GNU_SOURCE HAVE_VISIBILITY_ATTRIBUTE=1
     122endif
     123ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
     124 TEMPLATE_XPComDll_DEFS.solaris       = HAVE_LIBDL=1 HAVE_SENDFILEV=1 _REENTRANT
     125else
     126 TEMPLATE_XPComDll_DEFS.solaris       = HAVE_LIBDL=1 HAVE_SENDFILEV=1 _REENTRANT
    133127endif
    134128TEMPLATE_XPComDll_LDFLAGS             = $(TEMPLATE_VBoxR3DllNonPedantic_LDFLAGS)

  • trunk/src/libs/xpcom18a4/Makefile.kmk

    r102216 r102226  
    188188        nsprpub/pr/include/md/_unixos.h \
    189189        nsprpub/pr/include/md/_pth.h \
    190         nsprpub/pr/include/md/prosdep.h \
    191         \
    192         nsprpub/pr/include/md/_freebsd.cfg \
    193         nsprpub/pr/include/md/_linux.cfg \
    194         nsprpub/pr/include/md/_darwin.cfg \
    195         nsprpub/pr/include/md/_netbsd.cfg \
    196         nsprpub/pr/include/md/_openbsd.cfg \
    197         nsprpub/pr/include/md/_solaris32.cfg \
    198         nsprpub/pr/include/md/_solaris64.cfg
     190        nsprpub/pr/include/md/prosdep.h
    199191
    200192STRING-HEADERS_INST = $(INST_SDK)bindings/xpcom/include/string/
    … …  
    423415        _PR_PTHREADS
    424416VBox-xpcom-nspr_DEFS.freebsd = \
    425         FREEBSD=1 \
    426417        HAVE_CVAR_BUILT_ON_SEM \
    427418        _PR_PTHREADS
    428419## @todo filling in the missing stuff, please don't just copy it from linux.
    429 # FIXME: LINUX should be defined by _linux.cfg
    430420VBox-xpcom-nspr_DEFS.linux = \
    431         LINUX=1 \
    432421        _POSIX_SOURCE=1 \
    433422        _BSD_SOURCE=1 \

  • trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_vbox.cfg

    r101798 r102226  
    4040#define nspr_vboxcfg___
    4141
     42#include <iprt/cdefs.h>
     43
     44#ifdef RT_LITTLE_ENDIAN
     45#undef IS_BIG_ENDIAN
     46# define  IS_LITTLE_ENDIAN 1
     47#elif defined(RT_BIG_ENDIAN)
     48# undef IS_LITTLE_ENDIAN
     49# define  IS_BIG_ENDIAN 1
     50#else
     51# error "Unknown endianess"
     52#endif
     53
     54#define HAVE_LONG_LONG
     55
     56#define PR_BYTES_PER_BYTE   1
     57#define PR_BYTES_PER_SHORT  2
     58#define PR_BYTES_PER_INT    4
     59#define PR_BYTES_PER_INT64  8
     60#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_ARM64)
     61# define PR_BYTES_PER_LONG   8
     62#else
     63# define PR_BYTES_PER_LONG   4
     64#endif
     65#define PR_BYTES_PER_FLOAT  4
     66#define PR_BYTES_PER_DOUBLE 8
     67
     68#define PR_BITS_PER_BYTE    8
     69#define PR_BITS_PER_SHORT   16
     70#define PR_BITS_PER_INT     32
     71#define PR_BITS_PER_INT64   64
     72#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_ARM64)
     73# define PR_BITS_PER_LONG    64
     74#else
     75# define PR_BITS_PER_LONG    32
     76#endif
     77#define PR_BITS_PER_FLOAT   32
     78#define PR_BITS_PER_DOUBLE  64
     79
     80#define PR_BITS_PER_BYTE_LOG2   3
     81#define PR_BITS_PER_SHORT_LOG2  4
     82#define PR_BITS_PER_INT_LOG2    5
     83#define PR_BITS_PER_INT64_LOG2  6
     84#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_ARM64)
     85# define PR_BITS_PER_LONG_LOG2   6
     86#else
     87# define PR_BITS_PER_LONG_LOG2   5
     88#endif
     89#define PR_BITS_PER_FLOAT_LOG2  5
     90
     91#ifndef XP_UNIX
     92# define XP_UNIX
     93#endif
     94
    4295#ifdef RT_OS_DARWIN
    43 # include <md/_darwin.cfg>
     96# define DARWIN
    4497#elif defined(RT_OS_FREEBSD)
    45 # include <md/_freebsd.cfg>
    46 #elif defined(RT_OS_L4)
    47 # include <md/_l4v2.cfg>
     98# define FREEBSD
    4899#elif defined(RT_OS_LINUX)
    49 # include <md/_linux.cfg>
     100# define LINUX
    50101#elif defined(RT_OS_NETBSD)
    51 # include <md/_netbsd.cfg>
     102# define NETBSD
    52103#elif defined(RT_OS_OPENBSD)
    53 # include <md/_openbsd.cfg>
     104# define OPENBSD
    54105#elif defined(RT_OS_SOLARIS)
    55 # if defined(RT_ARCH_X86)
    56 #  include <md/_solaris32.cfg>
    57 # else
    58 #  include <md/_solaris64.cfg>
    59 # endif
    60 #elif defined(RT_OS_OS2)
    61 # include <md/_os2.cfg>
     106# define SOLARIS
    62107#else
    63108# error "Define the correct platform identifier / Port me."
Note: See TracChangeset for help on using the changeset viewer.

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