VirtualBox

Changeset 66840 in vbox for trunk


Ignore:
Timestamp:
May 8, 2017 6:34:59 PM (7 years ago)
Author:
vboxsync
Message:

tstRTStrFormat.cpp: build fix attempt.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Runtime/testcase/tstRTStrFormat.cpp

    r66824 r66840  
    513513    CHECK42("%RTproc", (RTPROCESS)0x43455443, "43455443");
    514514
    515     if (sizeof(RTUINTPTR) == 8)
    516     {
    517         CHECK42("%RTptr", (RTUINTPTR)0, "0000000000000000");
    518         CHECK42("%RTptr", ~(RTUINTPTR)0, "ffffffffffffffff");
    519         CHECK42("%RTptr", (RTUINTPTR)0x84342134, "0000000084342134");
    520     }
    521     else
    522     {
    523         CHECK42("%RTptr", (RTUINTPTR)0, "00000000");
    524         CHECK42("%RTptr", ~(RTUINTPTR)0, "ffffffff");
    525         CHECK42("%RTptr", (RTUINTPTR)0x84342134, "84342134");
    526     }
     515#if (HC_ARCH_BITS == 64 || GC_ARCH_BITS == 64)
     516    CHECK42("%RTptr", (RTUINTPTR)0, "0000000000000000");
     517    CHECK42("%RTptr", ~(RTUINTPTR)0, "ffffffffffffffff");
     518    CHECK42("%RTptr", (RTUINTPTR)(uintptr_t)0x84342134, "0000000084342134");
     519#else
     520    CHECK42("%RTptr", (RTUINTPTR)0, "00000000");
     521    CHECK42("%RTptr", ~(RTUINTPTR)0, "ffffffff");
     522    CHECK42("%RTptr", (RTUINTPTR)(uintptr_t)0x84342134, "84342134");
     523#endif
    527524
    528525#if ARCH_BITS == 64
     
    544541    CHECK42("%RTsel", (RTSEL)0xf8f8, "f8f8");
    545542
    546     if (sizeof(RTSEMEVENT) == 8)
    547     {
    548         CHECK42("%RTsem", (RTSEMEVENT)0, "0000000000000000");
    549         CHECK42("%RTsem", (RTSEMEVENT)(uintptr_t)0x23484342134ULL, "0000023484342134");
    550     }
    551     else
    552     {
    553         CHECK42("%RTsem", (RTSEMEVENT)0, "00000000");
    554         CHECK42("%RTsem", (RTSEMEVENT)(uintptr_t)0x84342134, "84342134");
    555     }
     543#if ARCH_BITS == 64
     544    CHECK42("%RTsem", (RTSEMEVENT)0, "0000000000000000");
     545    CHECK42("%RTsem", (RTSEMEVENT)(uintptr_t)0x23484342134ULL, "0000023484342134");
     546#else
     547    CHECK42("%RTsem", (RTSEMEVENT)0, "00000000");
     548    CHECK42("%RTsem", (RTSEMEVENT)(uintptr_t)0x84342134, "84342134");
     549#endif
    556550
    557551    CHECK42("%RTsock", (RTSOCKET)(uintptr_t)12234, "12234");
    558552    CHECK42("%RTsock", (RTSOCKET)(uintptr_t)584854543, "584854543");
    559553
    560     if (sizeof(RTTHREAD) == 8)
    561     {
    562         CHECK42("%RTthrd", (RTTHREAD)0, "0000000000000000");
    563         CHECK42("%RTthrd", (RTTHREAD)~(uintptr_t)0, "ffffffffffffffff");
    564         CHECK42("%RTthrd", (RTTHREAD)(uintptr_t)0x63484342134ULL, "0000063484342134");
    565     }
    566     else
    567     {
    568         CHECK42("%RTthrd", (RTTHREAD)0, "00000000");
    569         CHECK42("%RTthrd", (RTTHREAD)~(uintptr_t)0, "ffffffff");
    570         CHECK42("%RTthrd", (RTTHREAD)(uintptr_t)0x54342134, "54342134");
    571     }
     554#if ARCH_BITS == 64
     555    CHECK42("%RTthrd", (RTTHREAD)0, "0000000000000000");
     556    CHECK42("%RTthrd", (RTTHREAD)~(uintptr_t)0, "ffffffffffffffff");
     557    CHECK42("%RTthrd", (RTTHREAD)(uintptr_t)0x63484342134ULL, "0000063484342134");
     558#else
     559    CHECK42("%RTthrd", (RTTHREAD)0, "00000000");
     560    CHECK42("%RTthrd", (RTTHREAD)~(uintptr_t)0, "ffffffff");
     561    CHECK42("%RTthrd", (RTTHREAD)(uintptr_t)0x54342134, "54342134");
     562#endif
    572563
    573564    CHECK42("%RTuid", (RTUID)-2, "-2");
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