Index: /trunk/Doxyfile.Core =================================================================== --- /trunk/Doxyfile.Core (revision 25641) +++ /trunk/Doxyfile.Core (revision 25642) @@ -423,5 +423,9 @@ # INCLUDE_PATH = later # INCLUDE_FILE_PATTERNS = later -PREDEFINED = DOXYGEN_RUNNING __DOXYGEN__ RT_C_DECLS_END RT_C_DECLS_BEGIN VBOX +PREDEFINED = \ + DOXYGEN_RUNNING \ + RT_C_DECLS_END \ + RT_C_DECLS_BEGIN \ + VBOX # context hacks. PREDEFINED += RCPTRTYPE(RCType)=RCType @@ -527,115 +531,34 @@ STDMETHODIMP \ \ - CFGMDECL \ - CFGMGCDECL \ - CFGMR0DECL \ - CFGMR3DECL \ - CPUMDECL \ - CPUMGCDECL \ - CPUMR0DECL \ - CPUMR3DECL \ - CSAMDECL \ - CSAMGCDECL \ - CSAMR0DECL \ - CSAMR3DECL \ - DBGCR3DECL \ DBGDECL \ - DBGFDECL \ - DBGFGCDECL \ - DBGFR0DECL \ - DBGFR3DECL \ - DBGGCDECL \ - DBGR0DECL \ DISDECL \ - EMDECL \ - EMGCDECL \ - EMR0DECL \ - EMR3DECL \ GMMR0DECL \ GVMMR0DECL \ - HWACCMDECL \ - HWACCMGCDECL \ - HWACCMR0DECL \ - HWACCMR3DECL \ - IDEDECL \ - IDEGCDECL \ - IDER0DECL \ - IDER3DECL \ INTNETDECL \ - INTNETGCDECL \ + INTNETRCDECL \ INTNETR0DECL \ INTNETR3DECL \ - IOMDECL \ - IOMGCDECL \ - IOMR0DECL \ - IOMR3DECL \ - MMDECL \ - MMGCDECL \ - MMR0DECL \ - MMR3DECL \ - PATMDECL \ - PATMGCDECL \ - PATMR0DECL \ - PATMR3DECL \ PDMBOTHCBDECL \ - PDMDECL \ - PDMGCDECL \ - PDMR0DECL \ - PDMR3DECL \ PGM_BTH_DECL \ PGM_GST_DECL \ PGM_SHW_DECL \ - PGMDECL \ - PGMGCDECL \ - PGMR0DECL \ - PGMR3DECL \ REMDECL \ - REMGCDECL \ + REMRCDECL \ REMR0DECL \ REMR3DECL \ RTDECL \ - RTGCDECL \ + RTRCDECL \ RTR0DECL \ RTR3DECL \ RTDATADECL \ - SELMDECL \ - SELMGCDECL \ - SELMR0DECL \ - SELMR3DECL \ - SSMDECL \ - SSMGCDECL \ - SSMR3DECL \ - SSMR0DECL \ - STAMDECL \ - STAMGCDECL \ - STAMR0DECL \ - STAMR3DECL \ SUPDECL \ SUPR0DECL \ SUPR3DECL \ - TMDECL \ - TMGCDECL \ - TMR0DECL \ - TMR3DECL \ - TRPMDECL \ - TRPMGCDECL \ - TRPMR0DECL \ - TRPMR3DECL \ - USBR3DECL \ VBGLR3DECL \ VBOXDDU_DECL \ - VGADECL \ - VGAGCDECL \ - VGAR0DECL \ - VGAR3DECL \ - VMDECL \ - VMDECL \ - VMGCDECL \ VMMDECL \ - VMMGCDECL \ + VMMRCDECL \ VMMR0DECL \ - VMMR3DECL \ - VMR0DECL \ - VMR3DECL \ + VMMR3DECL SKIP_FUNCTION_MACROS = NO Index: /trunk/include/VBox/cdefs.h =================================================================== --- /trunk/include/VBox/cdefs.h (revision 25641) +++ /trunk/include/VBox/cdefs.h (revision 25642) @@ -57,5 +57,5 @@ * Shut up DOXYGEN warnings and guide it properly thru the code. */ -#ifdef __DOXYGEN__ +#ifdef DOXYGEN_RUNNING #define VBOX_WITH_STATISTICS #define VBOX_STRICT Index: /trunk/src/VBox/Main/Doxyfile.Main =================================================================== --- /trunk/src/VBox/Main/Doxyfile.Main (revision 25641) +++ /trunk/src/VBox/Main/Doxyfile.Main (revision 25642) @@ -1166,5 +1166,8 @@ # instead of the = operator. -PREDEFINED = __DOXYGEN__ RT_C_DECLS_END RT_C_DECLS_BEGIN +PREDEFINED = \ + DOXYGEN_RUNNING \ + RT_C_DECLS_END \ + RT_C_DECLS_BEGIN # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then @@ -1174,5 +1177,4 @@ EXPAND_AS_DEFINED = \ - GCTYPE \ DECLEXPORT \ DECLIMPORT \ @@ -1180,82 +1182,17 @@ DECLASMTYPE \ DECLCALLBACK \ - ASMINLINE \ VMMR3DECL \ VMMR0DECL \ - VMMGCDECL \ + VMMRCDECL \ VMMDECL \ + DBGDECL \ DISDECL \ SUPR3DECL \ SUPR0DECL \ SUPDECL \ - PDMR3DECL \ - PDMR0DECL \ - PDMGCDECL \ - PDMDECL \ - IOMR3DECL \ - IOMR0DECL \ - IOMGCDECL \ - IOMDECL \ - IDER3DECL \ - IDER0DECL \ - IDEGCDECL \ - IDEDECL \ - CFGMR3DECL \ - CFGMR0DECL \ - CFGMGCDECL \ - CFGMDECL \ - EMR3DECL \ - EMR0DECL \ - EMGCDECL \ - EMDECL \ RTR3DECL \ RTR0DECL \ - RTGCDECL \ - RTDECL \ - TRPMR3DECL \ - TRPMR0DECL \ - TRPMGCDECL \ - TRPMDECL \ - PGMR3DECL \ - PGMR0DECL \ - PGMGCDECL \ - PGMDECL \ - MMR3DECL \ - MMR0DECL \ - MMGCDECL \ - MMDECL \ - SELMR3DECL \ - SELMR0DECL \ - SELMGCDECL \ - SELMDECL \ - PATMR3DECL \ - PATMR0DECL \ - PATMGCDECL \ - PATMDECL \ - STAMR3DECL \ - STAMR0DECL \ - STAMGCDECL \ - STAMDECL \ - VGAR3DECL \ - VGAR0DECL \ - VGAGCDECL \ - VGADECL \ - DBGFR3DECL \ - DBGFR0DECL \ - DBGFGCDECL \ - DBGFDECL \ - DBGCR3DECL \ - DBGR0DECL \ - DBGGCDECL \ - DBGDECL \ - CPUMR3DECL \ - CPUMR0DECL \ - CPUMGCDECL \ - CPUMDECL \ - VMDECL \ - VMR3DECL \ - VMR0DECL \ - VMGCDECL \ - VMDECL \ + RTRCDECL \ + RTDECL Index: /trunk/src/VBox/Main/include/SessionImpl.h =================================================================== --- /trunk/src/VBox/Main/include/SessionImpl.h (revision 25641) +++ /trunk/src/VBox/Main/include/SessionImpl.h (revision 25642) @@ -37,5 +37,5 @@ * (The same goes for the other darwin changes.) */ -#ifdef __DOXYGEN__ +#ifdef DOXYGEN_RUNNING # define VBOX_WITH_SYS_V_IPC_SESSION_WATCHER #endif Index: /trunk/src/VBox/Runtime/Doxyfile =================================================================== --- /trunk/src/VBox/Runtime/Doxyfile (revision 25641) +++ /trunk/src/VBox/Runtime/Doxyfile (revision 25642) @@ -1162,5 +1162,6 @@ # instead of the = operator. -PREDEFINED = DOXYGEN_RUNNING __DOXYGEN__ \ +PREDEFINED = \ + DOXYGEN_RUNNING \ RT_C_DECLS_END= \ RT_C_DECLS_BEGIN= \ @@ -1173,4 +1174,6 @@ R0_ARCH_BITS=HC_ARCH_BITS \ RTDECL(type)=type \ + RT_EXPORT_SYMBOL(name)= \ + DECL_FORCE_INLINE(type)=DECLINLINE(type) # DECLCALLBACK(type)=type Index: /trunk/src/VBox/Runtime/include/internal/ldr.h =================================================================== --- /trunk/src/VBox/Runtime/include/internal/ldr.h (revision 25641) +++ /trunk/src/VBox/Runtime/include/internal/ldr.h (revision 25642) @@ -41,5 +41,5 @@ * Defined Constants And Macros * *******************************************************************************/ -#ifdef __DOXYGEN__ +#ifdef DOXYGEN_RUNNING /** @def LDR_WITH_NATIVE * Define this to get native support. */ @@ -65,5 +65,5 @@ * Define this to get mach-o support (not implemented yet). */ # define LDR_WITH_MACHO -#endif /* __DOXYGEN__ */ +#endif /* DOXYGEN_RUNNING */ #if defined(LDR_WITH_ELF32) || defined(LDR_WITH_ELF64) Index: /trunk/src/VBox/Runtime/include/internal/string.h =================================================================== --- /trunk/src/VBox/Runtime/include/internal/string.h (revision 25641) +++ /trunk/src/VBox/Runtime/include/internal/string.h (revision 25642) @@ -39,5 +39,5 @@ * Enables strict assertions on bad string encodings. */ -#ifdef __DOXYGEN__ +#ifdef DOXYGEN_RUNNING # define RTSTR_STRICT #endif Index: /trunk/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c (revision 25641) +++ /trunk/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c (revision 25642) @@ -40,5 +40,5 @@ #include "r0drv/alloc-r0drv.h" -#if defined(RT_ARCH_AMD64) || defined(__DOXYGEN__) +#if defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING) /** * We need memory in the module range (~2GB to ~0) this can only be obtained Index: /trunk/src/VBox/Runtime/r3/alloc-ef.h =================================================================== --- /trunk/src/VBox/Runtime/r3/alloc-ef.h (revision 25641) +++ /trunk/src/VBox/Runtime/r3/alloc-ef.h (revision 25642) @@ -35,5 +35,5 @@ * Defined Constants And Macros * *******************************************************************************/ -#if defined(__DOXYGEN__) +#if defined(DOXYGEN_RUNNING) # define RTALLOC_USE_EFENCE # define RTALLOC_EFENCE_IN_FRONT @@ -91,5 +91,5 @@ #define RTALLOC_EFENCE_FILLER 0xef -#if defined(__DOXYGEN__) +#if defined(DOXYGEN_RUNNING) /** @def RTALLOC_EFENCE_CPP * This define will enable the new and delete wrappers. Index: /trunk/src/VBox/Runtime/r3/linux/sched-linux.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/linux/sched-linux.cpp (revision 25641) +++ /trunk/src/VBox/Runtime/r3/linux/sched-linux.cpp (revision 25642) @@ -47,5 +47,5 @@ * with the 'thread' logging prefix. */ -#ifdef __DOXYGEN__ +#ifdef DOXYGEN_RUNNING # define THREAD_LOGGING #endif Index: /trunk/src/VBox/Runtime/r3/posix/fileio-posix.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/posix/fileio-posix.cpp (revision 25641) +++ /trunk/src/VBox/Runtime/r3/posix/fileio-posix.cpp (revision 25642) @@ -81,5 +81,5 @@ /** @def RT_DONT_CONVERT_FILENAMES * Define this to pass UTF-8 unconverted to the kernel. */ -#ifdef __DOXYGEN__ +#ifdef DOXYGEN_RUNNING #define RT_DONT_CONVERT_FILENAMES 1 #endif Index: /trunk/src/VBox/Runtime/r3/posix/sched-posix.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/posix/sched-posix.cpp (revision 25641) +++ /trunk/src/VBox/Runtime/r3/posix/sched-posix.cpp (revision 25642) @@ -47,5 +47,5 @@ * with the 'thread' logging prefix. */ -#ifdef __DOXYGEN__ +#ifdef DOXYGEN_RUNNING #define THREAD_LOGGING #endif Index: /trunk/src/VBox/Runtime/r3/win/fileio-win.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/win/fileio-win.cpp (revision 25641) +++ /trunk/src/VBox/Runtime/r3/win/fileio-win.cpp (revision 25642) @@ -52,5 +52,5 @@ /** @def RT_DONT_CONVERT_FILENAMES * Define this to pass UTF-8 unconverted to the kernel. */ -#ifdef __DOXYGEN__ +#ifdef DOXYGEN_RUNNING # define RT_DONT_CONVERT_FILENAMES 1 #endif Index: /trunk/src/recompiler/VBoxREMWrapper.cpp =================================================================== --- /trunk/src/recompiler/VBoxREMWrapper.cpp (revision 25641) +++ /trunk/src/recompiler/VBoxREMWrapper.cpp (revision 25642) @@ -160,5 +160,5 @@ * early porting (before we start running stuff). */ -#if defined(__DOXYGEN__) +#if defined(DOXYGEN_RUNNING) # define USE_REM_STUBS #endif @@ -168,5 +168,5 @@ * use calling convention wrappers. */ -#if (defined(RT_ARCH_AMD64) && defined(RT_OS_WINDOWS)) || defined(__DOXYGEN__) +#if (defined(RT_ARCH_AMD64) && defined(RT_OS_WINDOWS)) || defined(DOXYGEN_RUNNING) # define USE_REM_CALLING_CONVENTION_GLUE #endif @@ -176,5 +176,5 @@ * emit some jump glue to deal with big addresses. */ -#if (defined(RT_ARCH_AMD64) && !defined(USE_REM_CALLING_CONVENTION_GLUE) && !defined(RT_OS_DARWIN)) || defined(__DOXYGEN__) +#if (defined(RT_ARCH_AMD64) && !defined(USE_REM_CALLING_CONVENTION_GLUE) && !defined(RT_OS_DARWIN)) || defined(DOXYGEN_RUNNING) # define USE_REM_IMPORT_JUMP_GLUE #endif