Changeset 81549 in vbox for trunk/include
- Timestamp:
- Oct 25, 2019 2:49:25 PM (5 years ago)
- Location:
- trunk/include/iprt
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/iprt/cdefs.h
r81403 r81549 66 66 # define IN_RING0 67 67 # define IN_RING3 68 # define IN_RC69 68 # define IN_RC 70 69 # define IN_RT_RC … … 311 310 */ 312 311 #if !defined(ARCH_BITS) || defined(DOXYGEN_RUNNING) 313 # if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC64) 312 # if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC64) || defined(DOXYGEN_RUNNING) 314 313 # define ARCH_BITS 64 315 314 # elif !defined(__I86__) || !defined(__WATCOMC__) … … 353 352 */ 354 353 #if !defined(HC_ARCH_BITS) || defined(DOXYGEN_RUNNING) 355 # if ndef IN_RC354 # if !defined(IN_RC) || defined(DOXYGEN_RUNNING) 356 355 # define HC_ARCH_BITS ARCH_BITS 357 356 # else … … 363 362 * Defines the guest architecture bit count. 364 363 */ 365 #if !defined(GC_ARCH_BITS) && !defined(DOXYGEN_RUNNING)366 # if def VBOX_WITH_64_BITS_GUESTS364 #if !defined(GC_ARCH_BITS) || defined(DOXYGEN_RUNNING) 365 # if defined(VBOX_WITH_64_BITS_GUESTS) || defined(DOXYGEN_RUNNING) 367 366 # define GC_ARCH_BITS 64 368 367 # else … … 390 389 # else 391 390 # define R0_ARCH_BITS HC_ARCH_BITS 392 # endif393 #endif394 395 /** @def GC_ARCH_BITS396 * Defines the guest architecture bit count.397 */398 #if !defined(GC_ARCH_BITS) || defined(DOXYGEN_RUNNING)399 # ifdef IN_RC400 # define GC_ARCH_BITS ARCH_BITS401 # else402 # define GC_ARCH_BITS 32403 391 # endif 404 392 #endif … … 730 718 * @remark For pointers used only in one context use RCPTRTYPE(), R3R0PTRTYPE(), R3PTRTYPE() or R0PTRTYPE(). 731 719 */ 732 #if def IN_RC720 #if defined(IN_RC) && !defined(DOXYGEN_RUNNING) 733 721 # define CTXTYPE(GCType, R3Type, R0Type) GCType 734 #elif defined(IN_RING3) 722 #elif defined(IN_RING3) || defined(DOXYGEN_RUNNING) 735 723 # define CTXTYPE(GCType, R3Type, R0Type) R3Type 736 724 #else … … 798 786 * @deprecated Use CTX_SUFF. Do NOT use this for new code. 799 787 */ 800 #if def IN_RC788 #if defined(IN_RC) && !defined(DOXYGEN_RUNNING) 801 789 # define CTXSUFF(var) var##GC 802 790 # define OTHERCTXSUFF(var) var##HC … … 814 802 * @deprecated Use CTX_SUFF. Do NOT use this for new code. 815 803 */ 816 #if def IN_RC804 #if defined(IN_RC) && !defined(DOXYGEN_RUNNING) 817 805 # define CTXALLSUFF(var) var##GC 818 #elif defined(IN_RING0) 806 #elif defined(IN_RING0) && !defined(DOXYGEN_RUNNING) 819 807 # define CTXALLSUFF(var) var##R0 820 808 #else … … 831 819 * @remark This will replace CTXALLSUFF and CTXSUFF before long. 832 820 */ 833 #if def IN_RC821 #if defined(IN_RC) && !defined(DOXYGEN_RUNNING) 834 822 # define CTX_SUFF(var) var##RC 835 #elif defined(IN_RING0) 823 #elif defined(IN_RING0) && !defined(DOXYGEN_RUNNING) 836 824 # define CTX_SUFF(var) var##R0 837 825 #else … … 849 837 * @remark This will replace CTXALLSUFF and CTXSUFF before long. 850 838 */ 851 #if def IN_RING3839 #if defined(IN_RING3) || defined(DOXYGEN_RUNNING) 852 840 # define CTX_SUFF_Z(var) var##R3 853 841 #else … … 873 861 * @deprecated use CTX_MID or CTX_MID_Z 874 862 */ 875 #if def IN_RC863 #if defined(IN_RC) && !defined(DOXYGEN_RUNNING) 876 864 # define CTXMID(first, last) first##GC##last 877 865 # define OTHERCTXMID(first, last) first##HC##last … … 890 878 * @deprecated use CTX_MID or CTX_MID_Z 891 879 */ 892 #if def IN_RC880 #if defined(IN_RC) && !defined(DOXYGEN_RUNNING) 893 881 # define CTXALLMID(first, last) first##GC##last 894 #elif defined(IN_RING0) 882 #elif defined(IN_RING0) && !defined(DOXYGEN_RUNNING) 895 883 # define CTXALLMID(first, last) first##R0##last 896 884 #else … … 906 894 * @param last Surname. 907 895 */ 908 #if def IN_RC896 #if defined(IN_RC) && !defined(DOXYGEN_RUNNING) 909 897 # define CTX_MID(first, last) first##RC##last 910 #elif defined(IN_RING0) 898 #elif defined(IN_RING0) && !defined(DOXYGEN_RUNNING) 911 899 # define CTX_MID(first, last) first##R0##last 912 900 #else … … 1418 1406 * @param args The argument list enclosed in parentheses. 1419 1407 */ 1420 #if def IN_RING31408 #if defined(IN_RING3) || defined(DOXYGEN_RUNNING) 1421 1409 # define DECLR3CALLBACKMEMBER(type, name, args) DECLCALLBACKMEMBER(type, name) args 1422 1410 #else … … 1430 1418 * @param args The argument list enclosed in parentheses. 1431 1419 */ 1432 #if def IN_RC1420 #if defined(IN_RC) || defined(DOXYGEN_RUNNING) 1433 1421 # define DECLRCCALLBACKMEMBER(type, name, args) DECLCALLBACKMEMBER(type, name) args 1434 1422 #else 1435 1423 # define DECLRCCALLBACKMEMBER(type, name, args) RTRCPTR name 1436 1424 #endif 1437 #if def IN_RC1425 #if defined(IN_RC) || defined(DOXYGEN_RUNNING) 1438 1426 # define DECLRGCALLBACKMEMBER(type, name, args) DECLCALLBACKMEMBER(type, name) args 1439 1427 #else … … 1447 1435 * @param args The argument list enclosed in parentheses. 1448 1436 */ 1449 #if def IN_RING01437 #if defined(IN_RING0) || defined(DOXYGEN_RUNNING) 1450 1438 # define DECLR0CALLBACKMEMBER(type, name, args) DECLCALLBACKMEMBER(type, name) args 1451 1439 #else … … 1458 1446 * @remarks Don't use this macro on C++ methods. 1459 1447 */ 1460 #if def __GNUC__1448 #if defined(__GNUC__) && !defined(DOXYGEN_RUNNING) 1461 1449 # define DECLINLINE(type) static __inline__ type 1462 #elif defined(__cplusplus) 1450 #elif defined(__cplusplus) || defined(DOXYGEN_RUNNING) 1463 1451 # define DECLINLINE(type) static inline type 1464 1452 #elif defined(_MSC_VER) -
trunk/include/iprt/initterm.h
r76585 r81549 50 50 51 51 #ifdef IN_RING3 52 52 53 /** @name RTR3Init flags (RTR3INIT_XXX). 53 54 * @{ */ 54 55 /** Try initialize SUPLib. */ 55 # define RTR3INIT_FLAGS_SUPLIB RT_BIT(0)56 # define RTR3INIT_FLAGS_SUPLIB RT_BIT(0) 56 57 /** Initializing IPRT from a DLL. */ 57 # define RTR3INIT_FLAGS_DLL RT_BIT(1)58 # define RTR3INIT_FLAGS_DLL RT_BIT(1) 58 59 /** We are sharing a process space, so we need to behave. */ 59 # define RTR3INIT_FLAGS_UNOBTRUSIVE RT_BIT(2)60 # define RTR3INIT_FLAGS_UNOBTRUSIVE RT_BIT(2) 60 61 /** The caller ensures that the argument bector is UTF-8. */ 61 # define RTR3INIT_FLAGS_UTF8_ARGV RT_BIT(3)62 # define RTR3INIT_FLAGS_UTF8_ARGV RT_BIT(3) 62 63 /** Indicates that this is a standalone application without any additional 63 64 * shared libraries in the application directory. Mainly windows loader mess. */ 64 # define RTR3INIT_FLAGS_STANDALONE_APP RT_BIT(4)65 # define RTR3INIT_FLAGS_STANDALONE_APP RT_BIT(4) 65 66 /** @} */ 66 67 … … 68 69 * @{ */ 69 70 /** Version 1. */ 70 # define RTR3INIT_VER_1 UINT32_C(1)71 # define RTR3INIT_VER_1 UINT32_C(1) 71 72 /** The current version. */ 72 # define RTR3INIT_VER_CUR RTR3INIT_VER_173 # define RTR3INIT_VER_CUR RTR3INIT_VER_1 73 74 /** @} */ 74 75 … … 132 133 */ 133 134 RTR3DECL(bool) RTR3InitIsUnobtrusive(void); 135 134 136 #endif /* IN_RING3 */ 135 137 -
trunk/include/iprt/log.h
r81369 r81549 149 149 150 150 /** Logger structure. */ 151 #if def IN_RC151 #if defined(IN_RC) && !defined(DOXYGEN_RUNNING) 152 152 typedef struct RTLOGGERRC RTLOGGER; 153 153 #else … … 294 294 295 295 296 #if ndef IN_RC296 #if !defined(IN_RC) || defined(DOXYGEN_RUNNING) 297 297 298 298 /** Pointer to internal logger bits. */ … … 337 337 # define RTLOGGER_MAGIC UINT32_C(0x19281207) 338 338 339 #endif /* !IN_RC */339 #endif /* !IN_RC || DOXYGEN_RUNNING */ 340 340 341 341 … … 1704 1704 1705 1705 1706 #if ndef IN_RC1706 #if !defined(IN_RC) || defined(DOXYGEN_RUNNING) 1707 1707 /** 1708 1708 * Sets the default release logger instance. … … 1712 1712 */ 1713 1713 RTDECL(PRTLOGGER) RTLogRelSetDefaultInstance(PRTLOGGER pLogger); 1714 #endif /* !IN_RC */1714 #endif 1715 1715 1716 1716 /** … … 1939 1939 RTDECL(PRTLOGGER) RTLogGetDefaultInstanceEx(uint32_t fFlagsAndGroup); 1940 1940 1941 #if ndef IN_RC1941 #if !defined(IN_RC) || defined(DOXYGEN_RUNNING) 1942 1942 /** 1943 1943 * Sets the default logger instance. … … 1947 1947 */ 1948 1948 RTDECL(PRTLOGGER) RTLogSetDefaultInstance(PRTLOGGER pLogger); 1949 #endif /* !IN_RC */1949 #endif 1950 1950 1951 1951 #ifdef IN_RING0 … … 1964 1964 1965 1965 1966 #ifndef IN_RC 1966 #if !defined(IN_RC) || defined(DOXYGEN_RUNNING) 1967 1967 1968 /** 1968 1969 * Creates the default logger instance for a iprt users. … … 2221 2222 */ 2222 2223 RTDECL(int) RTLogGroupSettings(PRTLOGGER pLogger, const char *pszValue); 2223 #endif /* !IN_RC */ 2224 2225 #endif /* !IN_RC || DOXYGEN_RUNNING */ 2224 2226 2225 2227 /** … … 2260 2262 RTDECL(uint32_t) RTLogSetGroupLimit(PRTLOGGER pLogger, uint32_t cMaxEntriesPerGroup); 2261 2263 2262 #ifndef IN_RC 2264 #if !defined(IN_RC) || defined(DOXYGEN_RUNNING) 2265 2263 2266 /** 2264 2267 * Get the current log flags as a string. … … 2286 2289 * @returns IPRT status code. 2287 2290 * @param pLogger Logger instance (NULL for default logger). 2288 * @param pszValue The value to parse.2289 2291 * @param pErrInfo Where to return extended error info. Optional. 2290 2292 */ … … 2301 2303 */ 2302 2304 RTDECL(int) RTLogGetDestinations(PRTLOGGER pLogger, char *pszBuf, size_t cchBuf); 2303 #endif /* !IN_RC */ 2305 2306 #endif /* !IN_RC || DOXYGEN_RUNNING */ 2304 2307 2305 2308 /** -
trunk/include/iprt/thread.h
r81531 r81549 280 280 RTTHREADTYPE enmType, unsigned fFlags, const char *pszName); 281 281 #ifndef RT_OS_LINUX /* XXX crashes genksyms at least on 32-bit Linux hosts */ 282 /** @copydoc RTThreadCreate*/282 /** Pointer to a RTThreadCreate function. */ 283 283 typedef DECLCALLBACKPTR(int, PFNRTTHREADCREATE)(PRTTHREAD pThread, PFNRTTHREAD pfnThread, void *pvUser, size_t cbStack, 284 284 RTTHREADTYPE enmType, unsigned fFlags, const char *pszName); … … 298 298 * @param enmType See RTThreadCreate. 299 299 * @param fFlags See RTThreadCreate. 300 * @param pszName 300 * @param pszNameFmt Thread name format. 301 301 * @param va Format arguments. 302 302 */ … … 316 316 * @param enmType See RTThreadCreate. 317 317 * @param fFlags See RTThreadCreate. 318 * @param pszName 318 * @param pszNameFmt Thread name format. 319 319 * @param ... Format arguments. 320 320 */ … … 963 963 964 964 # endif /* IN_RING3 */ 965 # endif /* !IN_RC*/965 #endif /* !IN_RC || defined(DOXYGEN_RUNNING) */ 966 966 967 967 /** @} */ -
trunk/include/iprt/types.h
r81369 r81549 1522 1522 1523 1523 /** HC pointer. */ 1524 #if ndef IN_RC1524 #if !defined(IN_RC) || defined(DOXYGEN_RUNNING) 1525 1525 typedef void RT_FAR *RTHCPTR; 1526 1526 #else … … 1845 1845 /** @def NIL_RTRCPTR 1846 1846 * NIL RC pointer. */ 1847 #ifndef IN_RC 1847 #ifdef IN_RC 1848 # define NIL_RTRCPTR (NULL) 1849 #else 1848 1850 # define NIL_RTRCPTR ((RTRCPTR)0) 1849 #else1850 # define NIL_RTRCPTR (NULL)1851 1851 #endif 1852 1852 /** @def RTRCPTR_MAX
Note:
See TracChangeset
for help on using the changeset viewer.