VirtualBox

Ticket #9229: glibc.diff

File glibc.diff, 16.5 KB (added by Robert Millan, 13 years ago)
  • include/iprt/alloca.h

     
    3737 * When we're in kernel territory it starts getting a bit more
    3838 * interesting of course...
    3939 */
    40 #if defined(IN_RING0) \
    41  && (defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD))
     40#ifdef IN_RING0
     41# if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    4242/* ASSUMES GNU C */
    43 # define alloca(cb) __builtin_alloca(cb)
     43#  define alloca(cb) __builtin_alloca(cb)
     44# else
     45#  include <stdlib.h>
     46#  include <malloc.h>
     47# endif
    4448
    4549#else
    4650# include <stdlib.h>
    47 # if !defined(RT_OS_DARWIN) && !defined(RT_OS_FREEBSD)
     51# if !defined(RT_OS_DARWIN) && !defined(RT_OS_FREEBSD) && !defined(__GLIBC__)
    4852#  include <malloc.h>
    4953# endif
    5054# ifdef RT_OS_SOLARIS
  • src/VBox/Devices/Serial/DrvHostSerial.cpp

     
    3333#include <iprt/semaphore.h>
    3434#include <iprt/uuid.h>
    3535
    36 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     36#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    3737# include <errno.h>
    3838# ifdef RT_OS_SOLARIS
    3939#  include <sys/termios.h>
     
    101101    /** the device path */
    102102    char                        *pszDevicePath;
    103103
    104 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     104#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    105105    /** the device handle */
    106106    RTFILE                      hDeviceFile;
    107107# ifdef RT_OS_DARWIN
     
    194194static DECLCALLBACK(int) drvHostSerialSetParameters(PPDMICHARCONNECTOR pInterface, unsigned Bps, char chParity, unsigned cDataBits, unsigned cStopBits)
    195195{
    196196    PDRVHOSTSERIAL pThis = PDMICHAR_2_DRVHOSTSERIAL(pInterface);
    197 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     197#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    198198    struct termios *termiosSetup;
    199199    int baud_rate;
    200200#elif defined(RT_OS_WINDOWS)
     
    483483        {
    484484            /* copy the send queue so we get a linear buffer with the maximal size. */
    485485            uint8_t ch = pThis->u8SendByte;
    486 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     486#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    487487
    488488            size_t cbWritten;
    489489            rc = RTFileWrite(pThis->hDeviceFile, &ch, 1, &cbWritten);
     
    680680            }
    681681            cbRemaining = cbRead;
    682682
    683 #elif defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     683#elif defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    684684
    685685            size_t cbRead;
    686686            struct pollfd aFDs[2];
     
    845845static DECLCALLBACK(int) drvHostSerialWakeupRecvThread(PPDMDRVINS pDrvIns, PPDMTHREAD /*pThread*/)
    846846{
    847847    PDRVHOSTSERIAL pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTSERIAL);
    848 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     848#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    849849    size_t cbIgnored;
    850850    return RTPipeWrite(pThis->hWakeupPipeW, "", 1, &cbIgnored);
    851851
     
    858858#endif
    859859}
    860860
    861 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     861#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    862862/* -=-=-=-=- Monitor thread -=-=-=-=- */
    863863
    864864/**
     
    978978{
    979979    PDRVHOSTSERIAL pThis = PDMICHAR_2_DRVHOSTSERIAL(pInterface);
    980980
    981 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     981#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    982982    int modemStateSet = 0;
    983983    int modemStateClear = 0;
    984984
     
    10261026{
    10271027    PDRVHOSTSERIAL pThis = PDMICHAR_2_DRVHOSTSERIAL(pInterface);
    10281028
    1029 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     1029#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    10301030    if (fBreak)
    10311031        ioctl(RTFileToNative(pThis->hDeviceFile), TIOCSBRK);
    10321032    else
     
    10631063    pThis->SendSem = NIL_RTSEMEVENT;
    10641064
    10651065    int rc;
    1066 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     1066#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    10671067
    10681068    rc = RTPipeClose(pThis->hWakeupPipeW); AssertRC(rc);
    10691069    pThis->hWakeupPipeW = NIL_RTPIPE;
     
    11131113    /*
    11141114     * Init basic data members and interfaces.
    11151115     */
    1116 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     1116#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    11171117    pThis->hDeviceFile  = NIL_RTFILE;
    11181118# ifdef RT_OS_DARWIN
    11191119    pThis->hDeviceFileR = NIL_RTFILE;
     
    12091209        {
    12101210            case VERR_ACCESS_DENIED:
    12111211                return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
    1212 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     1212#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    12131213                                           N_("Cannot open host device '%s' for read/write access. Check the permissions "
    12141214                                              "of that device ('/bin/ls -l %s'): Most probably you need to be member "
    12151215                                              "of the device group. Make sure that you logout/login after changing "
     
    12271227    }
    12281228
    12291229    /* Set to non blocking I/O */
    1230 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     1230#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    12311231
    12321232    fcntl(RTFileToNative(pThis->hDeviceFile), F_SETFL, O_NONBLOCK);
    12331233# ifdef RT_OS_DARWIN
     
    12721272    if (RT_FAILURE(rc))
    12731273        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("HostSerial#%d cannot create send thread"), pDrvIns->iInstance);
    12741274
    1275 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     1275#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    12761276    /* Linux & darwin needs a separate thread which monitors the status lines. */
    12771277# ifndef RT_OS_LINUX
    12781278    ioctl(RTFileToNative(pThis->hDeviceFile), TIOCMGET, &pThis->fStatusLines);
  • src/VBox/Runtime/r3/posix/utf8-posix.cpp

     
    168168            size_t      cbOutLeft = cbOutput2;
    169169            const void *pvInputLeft = pvInput;
    170170            void       *pvOutputLeft = pvOutput;
    171 #if defined(RT_OS_LINUX) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */
     171#if defined(RT_OS_LINUX) || defined(__GLIBC__) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */
    172172            if (iconv(hIconv, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft) != (size_t)-1)
    173173#else
    174174            if (iconv(hIconv, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft) != (size_t)-1)
     
    294294            size_t      cbOutLeft = cbOutput2;
    295295            const void *pvInputLeft = pvInput;
    296296            void       *pvOutputLeft = pvOutput;
    297 #if defined(RT_OS_LINUX) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */
     297#if defined(RT_OS_LINUX) || defined(__GLIBC__) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */
    298298            if (iconv(icHandle, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft) != (size_t)-1)
    299299#else
    300300            if (iconv(icHandle, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft) != (size_t)-1)
  • src/VBox/Main/xml/Settings.cpp

     
    109109#   define VBOX_XML_PLATFORM     "solaris"
    110110#elif defined (RT_OS_WINDOWS)
    111111#   define VBOX_XML_PLATFORM     "windows"
     112#elif defined (__GLIBC__)
     113#   define VBOX_XML_PLATFORM     "gnu"
    112114#else
    113115#   error Unsupported platform!
    114116#endif
  • src/VBox/Main/cbinding/VBoxXPCOMCGlue.c

     
    4444/*******************************************************************************
    4545*   Defined Constants And Macros                                               *
    4646*******************************************************************************/
    47 #if defined(__linux__) || defined(__linux_gnu__) || defined(__sun__) || defined(__FreeBSD__)
     47#if defined(__linux__) || defined(__linux_gnu__) || defined(__GLIBC__) || defined(__sun__) || defined(__FreeBSD__)
    4848# define DYNLIB_NAME    "VBoxXPCOMC.so"
    4949#elif defined(__APPLE__)
    5050# define DYNLIB_NAME    "VBoxXPCOMC.dylib"
     
    189189     * Try the known standard locations.
    190190     */
    191191    g_szVBoxErrMsg[0] = '\0';
    192 #if defined(__gnu__linux__) || defined(__linux__)
     192#if defined(__gnu__linux__) || defined(__linux__) || defined(__GLIBC__)
    193193    if (tryLoadOne("/opt/VirtualBox", 1) == 0)
    194194        return 0;
    195195    if (tryLoadOne("/usr/lib/virtualbox", 1) == 0)
  • src/VBox/GuestHost/OpenGL/include/cr_dll.h

     
    2222        char *name;
    2323#if defined(WINDOWS)
    2424        HINSTANCE hinstLib;
    25 #elif defined(IRIX) || defined(IRIX64) || defined(Linux) || defined(FreeBSD) || defined(AIX) || defined(SunOS) || defined(OSF1)
     25#elif defined(IRIX) || defined(IRIX64) || defined(Linux) || defined(__GLIBC__) || defined(FreeBSD) || defined(AIX) || defined(SunOS) || defined(OSF1)
    2626        void *hinstLib;
    2727#elif defined(DARWIN)
    2828        void *hinstLib;         /* void to avoid including the headers */
  • src/VBox/GuestHost/OpenGL/include/cr_timer.h

     
    3535#elif defined(WINDOWS)
    3636        LARGE_INTEGER performance_counter, performance_frequency;
    3737        double one_over_frequency;
    38 #elif defined( Linux ) || defined( FreeBSD ) || defined(DARWIN) || defined(AIX) || defined (SunOS) || defined(OSF1)
     38#elif defined( Linux ) || defined(__GLIBC__) || defined( FreeBSD ) || defined(DARWIN) || defined(AIX) || defined (SunOS) || defined(OSF1)
    3939        struct timeval timeofday;
    4040#endif
    4141} CRTimer;
  • src/VBox/GuestHost/OpenGL/spu_loader/glloader.py

     
    3434#  define SYSTEM_AGL "AGL"
    3535# endif
    3636#include <string.h> /* VBOX */
    37 #elif defined(IRIX) || defined(IRIX64) || defined(Linux) || defined(FreeBSD) || defined(AIX) || defined(SunOS) || defined(OSF1)
     37#elif defined(IRIX) || defined(IRIX64) || defined(Linux) || defined(__GLIBC__) || defined(FreeBSD) || defined(AIX) || defined(SunOS) || defined(OSF1)
    3838#include <string.h>
    3939#if defined(AIX)
    4040#define SYSTEM_GL "libGL.o"
     
    143143                 * version if it exists; otherwise, we'll use /usr/lib.
    144144                 */
    145145                /*crStrcpy(system_path, "/usr/lib");*/
    146 #if defined(__linux__) && defined(__amd64__)
     146#if (defined(__linux__) || defined(__GLIBC_)) && defined(__amd64__)
    147147                /*if (sizeof(void *) == 8 && FileExists("/usr/lib64", lib)) {
    148148                        crStrcat(system_path, "64");
    149149                }*/
     
    154154                }*/
    155155#endif
    156156        }
    157 #if !defined(__linux__) && !defined(SunOS) && !defined(__FreeBSD__)
     157#if !defined(__linux__) && !defined(__GLIBC__) && !defined(SunOS) && !defined(__FreeBSD__)
    158158        crStrcat( system_path, "/" );
    159159#endif
    160160#if !defined(CR_NO_GL_SYSTEM_PATH)
  • src/VBox/GuestHost/OpenGL/util/dll.c

     
    1414#include <string.h>
    1515#endif
    1616
    17 #if defined(IRIX) || defined(IRIX64) || defined(Linux) || defined(FreeBSD) || defined(AIX) || defined(DARWIN) || defined(SunOS) || defined(OSF1)
     17#if defined(IRIX) || defined(IRIX64) || defined(__GLIBC__) || defined(FreeBSD) || defined(AIX) || defined(DARWIN) || defined(SunOS) || defined(OSF1)
    1818#include <dlfcn.h>
    1919#endif
    2020
     
    203203                dll_err = "Unknown DLL type";
    204204                break;
    205205        };
    206 #elif defined(IRIX) || defined(IRIX64) || defined(Linux) || defined(FreeBSD) || defined(AIX) || defined(SunOS) || defined(OSF1)
     206#elif defined(IRIX) || defined(IRIX64) || defined(__GLIBC__) || defined(FreeBSD) || defined(AIX) || defined(SunOS) || defined(OSF1)
    207207        if (resolveGlobal)
    208208                dll->hinstLib = dlopen( dllname, RTLD_LAZY | RTLD_GLOBAL );
    209209        else
     
    256256
    257257        return (CRDLLFunc) NSAddressOfSymbol( nssym );
    258258
    259 #elif defined(IRIX) || defined(IRIX64) || defined(Linux) || defined(FreeBSD) || defined(AIX) || defined(SunOS) || defined(OSF1)
     259#elif defined(IRIX) || defined(IRIX64) || defined(__GLIBC__) || defined(FreeBSD) || defined(AIX) || defined(SunOS) || defined(OSF1)
    260260        return (CRDLLFunc) dlsym( dll->hinstLib, symname );
    261261#else
    262262#error CR DLL ARCHITETECTURE
     
    300300                NSUnLinkModule( (NSModule) dll->hinstLib, 0L );
    301301                break;
    302302        }
    303 #elif defined(IRIX) || defined(IRIX64) || defined(Linux) || defined(FreeBSD) || defined(AIX) || defined(SunOS) || defined(OSF1)
     303#elif defined(IRIX) || defined(IRIX64) || defined(__GLIBC__) || defined(FreeBSD) || defined(AIX) || defined(SunOS) || defined(OSF1)
    304304        /*
    305305         * Unloading Nvidia's libGL will crash VirtualBox later during shutdown.
    306306         * Therefore we will skip unloading it. It will be unloaded later anway
  • src/VBox/GuestHost/OpenGL/util/timer.c

     
    3535#elif defined( WINDOWS )
    3636        QueryPerformanceCounter( &t->performance_counter );
    3737        return ((double) t->performance_counter.QuadPart)*t->one_over_frequency;
    38 #elif defined( Linux ) || defined( FreeBSD ) || defined(DARWIN) || defined(AIX) || defined(SunOS) || defined(OSF1)
     38#elif defined( Linux ) || defined(__GLIBC__) || defined( FreeBSD ) || defined(DARWIN) || defined(AIX) || defined(SunOS) || defined(OSF1)
    3939        gettimeofday( &t->timeofday, NULL );   
    4040        return t->timeofday.tv_sec + t->timeofday.tv_usec / 1000000.0;
    4141#else
  • src/VBox/Additions/x11/VBoxClient/seamless-guest.h

     
    4343    };
    4444};
    4545
    46 #if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
     46#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__GLIBC__)
    4747# include "seamless-x11.h"  /* for VBoxGuestSeamlessGuestImpl */
    4848#else
    4949# error Port me

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