vbox的更動 13832 路徑 trunk/include

時間撮記:

2008-11-5 上午02:01:12 (16 年 以前)

作者:

vboxsync

訊息:

IN_GC -> IN_RC.

位置:

trunk/include

檔案:

• VBox/cpum.h (修改) (2 筆差異)
• VBox/dbgf.h (修改) (1 筆差異)
• VBox/em.h (修改) (2 筆差異)
• VBox/hwaccm.h (修改) (1 筆差異)
• VBox/iom.h (修改) (2 筆差異)
• VBox/mm.h (修改) (5 筆差異)
• VBox/patm.h (修改) (1 筆差異)
• VBox/pdmapi.h (修改) (1 筆差異)
• VBox/pdmins.h (修改) (1 筆差異)
• VBox/pgm.h (修改) (7 筆差異)
• VBox/rem.h (修改) (1 筆差異)
• VBox/trpm.h (修改) (1 筆差異)
• VBox/vm.h (修改) (5 筆差異)
• VBox/vmapi.h (修改) (4 筆差異)
• VBox/vmm.h (修改) (1 筆差異)
• VBox/vrdpapi.h (修改) (8 筆差異)
• VBox/vrdpusb.h (修改) (1 筆差異)
• iprt/asmdefs.mac (修改) (3 筆差異)
• iprt/cdefs.h (修改) (13 筆差異)
• iprt/initterm.h (修改) (1 筆差異)
• iprt/log.h (修改) (8 筆差異)
• iprt/mem.h (修改) (1 筆差異)
• iprt/runtime.h (修改) (4 筆差異)
• iprt/thread.h (修改) (1 筆差異)
• iprt/time.h (修改) (1 筆差異)
• iprt/types.h (修改) (4 筆差異)

trunk/include/VBox/cpum.h

@@ -975 +975 @@
 #endif /* IN_RING3 */
 
-#ifdef IN_GC
+#ifdef IN_RC
 /** @defgroup grp_cpum_gc    The CPU Monitor(/Manager) API
  * @ingroup grp_cpum
@@ -998 +998 @@
 
 /** @} */
-#endif /* IN_GC */
+#endif /* IN_RC */
 
 #ifdef IN_RING0

trunk/include/VBox/dbgf.h

@@ -45 +45 @@
  */
 
-#ifdef IN_GC
+#ifdef IN_RC
 /** @addgroup grp_dbgf_gc  The GC DBGF API
  * @ingroup grp_dbgf

trunk/include/VBox/em.h

@@ -202 +202 @@
 
 
-#ifdef IN_GC
+#ifdef IN_RC
 /** @defgroup grp_em_gc     The EM Guest Context API
  * @ingroup grp_em
@@ -215 +215 @@
 VMMRCDECL(uint32_t) EMGCEmulateXAdd(RTRCPTR pu32Param1, uint32_t *pu32Param2, size_t cbSize, uint32_t *pEflags);
 /** @} */
-#endif /* IN_GC */
+#endif /* IN_RC */
 
 /** @} */

trunk/include/VBox/hwaccm.h

@@ -69 +69 @@
 VMMDECL(bool)   HWACCMHasPendingIrq(PVM pVM);
 
-#ifndef IN_GC
+#ifndef IN_RC
 VMMDECL(int)     HWACCMFlushTLB(PVM pVM);
 VMMDECL(int)     HWACCMInvalidatePhysPage(PVM pVM, RTGCPHYS GCPhys);

trunk/include/VBox/iom.h

@@ -217 +217 @@
 VMMDECL(int)  IOMMMIOResetRegion(PVM pVM, RTGCPHYS GCPhys);
 
-#ifdef IN_GC
+#ifdef IN_RC
 /** @defgroup grp_iom_gc    The IOM Guest Context API
  * @ingroup grp_iom
@@ -224 +224 @@
 VMMRCDECL(int) IOMGCIOPortHandler(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu);
 /** @} */
-#endif /* IN_GC */
+#endif /* IN_RC */
 
 

trunk/include/VBox/mm.h

@@ -238 +238 @@
 
 
-#ifndef IN_GC
+#ifndef IN_RC
 VMMDECL(void *)     MMHyperRCToCC(PVM pVM, RTRCPTR RCPtr);
 #else
@@ -268 +268 @@
 #endif
 
-#ifndef IN_GC
+#ifndef IN_RC
 VMMDECL(RTRCPTR)    MMHyperCCToRC(PVM pVM, void *pv);
 #else
@@ -299 +299 @@
 /** @def MMHYPER_RC_ASSERT_RCPTR
  * Asserts that an address is either NULL or inside the hypervisor memory area.
- * This assertion only works while IN_GC, it's a NOP everywhere else.
+ * This assertion only works while IN_RC, it's a NOP everywhere else.
  * @thread  The Emulation Thread.
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define MMHYPER_RC_ASSERT_RCPTR(pVM, RCPtr)   Assert(MMHyperIsInsideArea((pVM), (RTRCUINTPTR)(RCPtr)) || !(RCPtr))
 #else
@@ -405 +405 @@
 
 
-#ifdef IN_GC
+#ifdef IN_RC
 /** @defgroup grp_mm_gc    The MM Guest Context API
  * @ingroup grp_mm
@@ -419 +419 @@
 
 /** @} */
-#endif /* IN_GC */
+#endif /* IN_RC */
 
 /** @} */

trunk/include/VBox/patm.h

@@ -292 +292 @@
 #endif
 
-#ifdef IN_GC
+#ifdef IN_RC
 /** @defgroup grp_patm_gc    The Patch Manager API
  * @ingroup grp_patm

trunk/include/VBox/pdmapi.h

@@ -120 +120 @@
 
 
-#ifdef IN_GC
+#ifdef IN_RC
 /** @defgroup grp_pdm_gc    The PDM Guest Context API
  * @ingroup grp_pdm

trunk/include/VBox/pdmins.h

@@ -39 +39 @@
  * Macro for declaring a callback which is static in HC and exported in GC.
  */
-#if defined(IN_GC) || defined(IN_RING0)
+#if defined(IN_RC) || defined(IN_RING0)
 # define PDMBOTHCBDECL(type)    DECLEXPORT(type)
 #else

trunk/include/VBox/pgm.h

@@ -385 +385 @@
 {
     /** @todo see PGMPhysIsPageMappingLockValid for possibly incorrect assumptions */
-#ifdef IN_GC
+#ifdef IN_RC
     /** Just a dummy for the time being. */
     uint32_t    u32Dummy;
@@ -413 +413 @@
 {
     /** @todo -> complete/change this  */
-#ifdef IN_GC
+#ifdef IN_RC
     return !!(pLock->u32Dummy);
 #else
@@ -426 +426 @@
 VMMDECL(void)       PGMPhysRead(PVM pVM, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead);
 VMMDECL(void)       PGMPhysWrite(PVM pVM, RTGCPHYS GCPhys, const void *pvBuf, size_t cbWrite);
-#ifndef IN_GC /* Only ring 0 & 3. */
+#ifndef IN_RC /* Only ring 0 & 3. */
 VMMDECL(int)        PGMPhysSimpleReadGCPhys(PVM pVM, void *pvDst, RTGCPHYS GCPhysSrc, size_t cb);
 VMMDECL(int)        PGMPhysSimpleWriteGCPhys(PVM pVM, RTGCPHYS GCPhysDst, const void *pvSrc, size_t cb);
@@ -434 +434 @@
 VMMDECL(int)        PGMPhysWriteGCPtr(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb);
 VMMDECL(int)        PGMPhysSimpleDirtyWriteGCPtr(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb);
-#endif /* !IN_GC */
+#endif /* !IN_RC */
 VMMDECL(int)        PGMPhysInterpretedRead(PVM pVM, PCPUMCTXCORE pCtxCore, void *pvDst, RTGCUINTPTR GCPtrSrc, size_t cb);
 #ifdef VBOX_STRICT
@@ -442 +442 @@
 #endif /* VBOX_STRICT */
 
-#if defined(IN_GC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE)
+#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE)
 VMMDECL(int)        PGMDynMapGCPage(PVM pVM, RTGCPHYS GCPhys, void **ppv);
 VMMDECL(int)        PGMDynMapGCPageOff(PVM pVM, RTGCPHYS GCPhys, void **ppv);
@@ -450 +450 @@
 
 
-#ifdef IN_GC
+#ifdef IN_RC
 /** @defgroup grp_pgm_gc  The PGM Guest Context API
  * @ingroup grp_pgm
@@ -456 +456 @@
  */
 /** @} */
-#endif /* IN_GC */
+#endif /* IN_RC */
 
 

trunk/include/VBox/rem.h

@@ -47 +47 @@
 
 
-#if defined(IN_RING0) || defined(IN_GC)
+#if defined(IN_RING0) || defined(IN_RC)
 VMMDECL(int)  REMNotifyInvalidatePage(PVM pVM, RTGCPTR GCPtrPage);
 VMMDECL(void) REMNotifyHandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler);
 VMMDECL(void) REMNotifyHandlerPhysicalDeregister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM);
 VMMDECL(void) REMNotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhysOld, RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM);
-#endif /* IN_RING0 || IN_GC */
+#endif /* IN_RING0 || IN_RC */
 VMMDECL(void) REMFlushTBs(PVM pVM);
 

trunk/include/VBox/trpm.h

@@ -114 +114 @@
 
 
-#ifdef IN_GC
+#ifdef IN_RC
 /** @defgroup grp_trpm_gc    The TRPM Guest Context API
  * @ingroup grp_trpm

trunk/include/VBox/vm.h

@@ -359 +359 @@
  *          code to let threads other than EMT mess around with the VM.
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define VM_IS_EMT(pVM)                     true
 #elif defined(IN_RING0)
@@ -371 +371 @@
  * Asserts that the current thread IS the emulation thread (EMT).
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define VM_ASSERT_EMT(pVM)                 Assert(VM_IS_EMT(pVM))
 #elif defined(IN_RING0)
@@ -384 +384 @@
  * Asserts that the current thread IS the emulation thread (EMT) and returns if it isn't.
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define VM_ASSERT_EMT_RETURN(pVM, rc)      AssertReturn(VM_IS_EMT(pVM), (rc))
 #elif defined(IN_RING0)
@@ -400 +400 @@
  * @todo r=bird: See VMMGetCpuId().
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define VM_GET_VMCPUID(pVM)                0
 #elif defined(IN_RING0)
@@ -788 +788 @@
 
 
-#ifdef IN_GC
+#ifdef IN_RC
 __BEGIN_DECLS
 

trunk/include/VBox/vmapi.h

@@ -68 +68 @@
  * @param   pvInVM  CC pointer within the VM.
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define VM_R3_ADDR(pVM, pvInVM)       ( (RTR3PTR)((RTR3UINTPTR)pVM->pVMR3 + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMRC)) )
 #elif defined(IN_RING0)
@@ -85 +85 @@
  * @param   pvInVM  CC pointer within the VM.
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define VM_R0_ADDR(pVM, pvInVM)       ( (RTR0PTR)((RTR0UINTPTR)pVM->pVMR0 + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMRC)) )
 #elif defined(IN_RING3)
@@ -313 +313 @@
 
 
-#ifndef IN_GC
+#ifndef IN_RC
 /** @defgroup grp_vmm_apis_hc  VM Host Context API
  * @ingroup grp_vm
@@ -425 +425 @@
 
 
-#ifdef IN_GC
+#ifdef IN_RC
 /** @defgroup grp_vmm_apis_gc  VM Guest Context APIs
  * @ingroup grp_vm

trunk/include/VBox/vmm.h

@@ -284 +284 @@
 
 
-#ifdef IN_GC
+#ifdef IN_RC
 /** @defgroup grp_vmm_rc    The VMM Raw-Mode Context API
  * @ingroup grp_vmm

trunk/include/VBox/vrdpapi.h

@@ -38 +38 @@
 # error "There are no VRDP APIs available in Ring-0 Host Context!"
 #endif
-#ifdef IN_GC
+#ifdef IN_RC
 # error "There are no VRDP APIs available Guest Context!"
 #endif
@@ -338 +338 @@
 #define VRDP_USB_XFER_BO    (10)
 #define VRDP_USB_XFER_BU    (11)
-#define VRDP_USB_XFER_ERR   (12) /* VBox protocol error. */ 
+#define VRDP_USB_XFER_ERR   (12) /* VBox protocol error. */
 
 #define VRDP_USB_REAP_FLAG_CONTINUED (0x0)
@@ -472 +472 @@
 {
     uint8_t flags;
-    uint32_t u32Version; /* This field presents only if the VRDP_USB_CAPS2_FLAG_VERSION flag is set. */ 
+    uint32_t u32Version; /* This field presents only if the VRDP_USB_CAPS2_FLAG_VERSION flag is set. */
 } VRDPUSBREQNEGOTIATERET_2;
 #pragma pack()
@@ -611 +611 @@
      * @param hServer     The server instance handle.
      * @param u32ClientId The client identifier.
-     * @param fReconnect  Whether to send a "REDIRECT to the same server" packet to the 
+     * @param fReconnect  Whether to send a "REDIRECT to the same server" packet to the
      *                    client before disconnecting.
      *
@@ -747 +747 @@
 } VRDPENTRYPOINTS_1;
 
-/** The VRDP server entry points. Interface version 2. 
+/** The VRDP server entry points. Interface version 2.
  *  A new entry point VRDPRedirect has been added relative to version 1.
  */
@@ -778 +778 @@
      * @param hServer     The server instance handle.
      * @param u32ClientId The client identifier.
-     * @param fReconnect  Whether to send a "REDIRECT to the same server" packet to the 
+     * @param fReconnect  Whether to send a "REDIRECT to the same server" packet to the
      *                    client before disconnecting.
      *
@@ -1012 +1012 @@
 
     /* A client is logging in, the application must decide whether
-     * to let to connect the client. The server will drop the connection, 
+     * to let to connect the client. The server will drop the connection,
      * when an error code is returned by the callback.
      *
@@ -1151 +1151 @@
     DECLR3CALLBACKMEMBER(void, VRDPCallbackVideoModeHint,(void *pvCallback,
                                                         unsigned cWidth,
-                                                        unsigned cHeight, 
+                                                        unsigned cHeight,
                                                         unsigned cBitsPerPixel,
                                                         unsigned uScreenId));

trunk/include/VBox/vrdpusb.h

@@ -38 +38 @@
 # error "There are no VRDP APIs available in Ring-0 Host Context!"
 #endif
-#ifdef IN_GC
+#ifdef IN_RC
 # error "There are no VRDP APIs available Guest Context!"
 #endif

trunk/include/iprt/asmdefs.mac

@@ -268 +268 @@
 ; Defines the host architechture bit count.
 %ifndef HC_ARCH_BITS
- %ifndef IN_GC
+ %ifndef IN_RC
   %define HC_ARCH_BITS ARCH_BITS
  %else
@@ -298 +298 @@
 ; Defines the guest architechture bit count.
 %ifndef GC_ARCH_BITS
- %ifdef IN_GC
+ %ifdef IN_RC
   %define GC_ARCH_BITS ARCH_BITS
  %else
@@ -480 +480 @@
 ; The size in bytes of a pointer in the current context.
 
-%ifdef IN_GC
+%ifdef IN_RC
  %define RTCCPTR_DEF        RTRCPTR_DEF
  %define RTCCPTR_RES        RTRCPTR_RES

trunk/include/iprt/cdefs.h

@@ -77 +77 @@
 #define IN_RING0
 #define IN_RING3
-#define IN_GC
+#define IN_RC
+#define IN_RC
 #define IN_RT_GC
 #define IN_RT_R0
@@ -142 +143 @@
  */
 
-/** @def IN_GC
+/** @def IN_RC
  * Used to indicate that we're compiling code which is running
- * in Guest Context (implies R0).
- */
-#if !defined(IN_RING3) && !defined(IN_RING0) && !defined(IN_GC)
-# error "You must defined which context the compiled code should run in; IN_RING3, IN_RING0 or IN_GC"
-#endif
-#if (defined(IN_RING3) && (defined(IN_RING0) || defined(IN_GC)) ) \
- || (defined(IN_RING0) && (defined(IN_RING3) || defined(IN_GC)) ) \
- || (defined(IN_GC)    && (defined(IN_RING3) || defined(IN_RING0)) )
-# error "Only one of the IN_RING3, IN_RING0, IN_GC defines should be defined."
+ * in the Raw-mode Context (implies R0).
+ */
+#if !defined(IN_RING3) && !defined(IN_RING0) && !defined(IN_RC) && !defined(IN_RC)
+# error "You must defined which context the compiled code should run in; IN_RING3, IN_RING0 or IN_RC"
+#endif
+#if (defined(IN_RING3) && (defined(IN_RING0) || defined(IN_RC)) ) \
+ || (defined(IN_RING0) && (defined(IN_RING3) || defined(IN_RC)) ) \
+ || (defined(IN_RC)    && (defined(IN_RING3) || defined(IN_RING0)) )
+# error "Only one of the IN_RING3, IN_RING0, IN_RC defines should be defined."
 #endif
 
@@ -171 +172 @@
  */
 #if !defined(HC_ARCH_BITS) || defined(DOXYGEN_RUNNING)
-# ifndef IN_GC
+# ifndef IN_RC
 #  define HC_ARCH_BITS ARCH_BITS
 # else
@@ -215 +216 @@
  */
 #if !defined(GC_ARCH_BITS) || defined(DOXYGEN_RUNNING)
-# ifdef IN_GC
+# ifdef IN_RC
 #  define GC_ARCH_BITS ARCH_BITS
 # else
@@ -231 +232 @@
  * @remark  For pointers used only in one context use RCPTRTYPE(), R3R0PTRTYPE(), R3PTRTYPE() or R0PTRTYPE().
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define CTXTYPE(GCType, R3Type, R0Type)  GCType
 #elif defined(IN_RING3)
@@ -292 +293 @@
  * @deprecated Use CTX_SUFF. Do NOT use this for new code.
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define CTXSUFF(var)       var##GC
 # define OTHERCTXSUFF(var)  var##HC
@@ -308 +309 @@
  * @deprecated Use CTX_SUFF. Do NOT use this for new code.
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define CTXALLSUFF(var)    var##GC
 #elif defined(IN_RING0)
@@ -325 +326 @@
  * @remark  This will replace CTXALLSUFF and CTXSUFF before long.
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define CTX_SUFF(var)      var##RC
 #elif defined(IN_RING0)
@@ -367 +368 @@
  * @deprecated use CTX_MID or CTX_MID_Z
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define CTXMID(first, last)        first##GC##last
 # define OTHERCTXMID(first, last)   first##HC##last
@@ -384 +385 @@
  * @deprecated use CTX_MID or CTX_MID_Z
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define CTXALLMID(first, last)     first##GC##last
 #elif defined(IN_RING0)
@@ -400 +401 @@
  * @param   last    Surname.
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define CTX_MID(first, last)       first##RC##last
 #elif defined(IN_RING0)
@@ -466 +467 @@
  * @see R3STRING, R0STRING
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define RCSTRING(pRCString)    (pRCString)
 #else
@@ -611 +612 @@
  * @param   args    The argument list enclosed in parentheses.
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define DECLRCCALLBACKMEMBER(type, name, args)  type (RTCALL * name) args
 #else

trunk/include/iprt/initterm.h

@@ -117 +117 @@
 #endif
 
-#ifdef IN_GC
+#ifdef IN_RC
 /**
  * Initializes the raw-mode context runtime library.

trunk/include/iprt/log.h

@@ -148 +148 @@
 
 /** Logger structure. */
-#ifdef IN_GC
+#ifdef IN_RC
 typedef struct RTLOGGERRC RTLOGGER;
 #else
@@ -232 +232 @@
 
 
-#ifndef IN_GC
+#ifndef IN_RC
 /**
  * Logger instance structure.
@@ -1005 +1005 @@
 
 
-#ifndef IN_GC
+#ifndef IN_RC
 /**
  * Sets the default release logger instance.
@@ -1013 +1013 @@
  */
 RTDECL(PRTLOGGER) RTLogRelSetDefaultInstance(PRTLOGGER pLogger);
-#endif /* !IN_GC */
+#endif /* !IN_RC */
 
 /**
@@ -1210 +1210 @@
 RTDECL(PRTLOGGER)   RTLogDefaultInstance(void);
 
-#ifndef IN_GC
+#ifndef IN_RC
 /**
  * Sets the default logger instance.
@@ -1218 +1218 @@
  */
 RTDECL(PRTLOGGER) RTLogSetDefaultInstance(PRTLOGGER pLogger);
-#endif /* !IN_GC */
+#endif /* !IN_RC */
 
 #ifdef IN_RING0
@@ -1253 +1253 @@
 
 
-#ifndef IN_GC
+#ifndef IN_RC
 /**
  * Creates the default logger instance for a iprt users.
@@ -1411 +1411 @@
  */
 RTDECL(int) RTLogGroupSettings(PRTLOGGER pLogger, const char *pszVar);
-#endif /* !IN_GC */
+#endif /* !IN_RC */
 
 /**

trunk/include/iprt/mem.h

@@ -39 +39 @@
 
 
-#ifdef IN_GC
+#ifdef IN_RC
 # error "There are no RTMem APIs available Guest Context!"
 #endif

trunk/include/iprt/runtime.h

@@ -36 +36 @@
 #include <iprt/initterm.h>
 
-#ifndef IN_GC
+#ifndef IN_RC
 # include <iprt/alloc.h>
 #endif
@@ -47 +47 @@
 #include <iprt/dir.h>
 #include <iprt/err.h>
-#ifndef IN_GC
+#ifndef IN_RC
 # include <iprt/file.h>
 # include <iprt/fs.h>
@@ -55 +55 @@
 #include <iprt/log.h>
 #include <iprt/md5.h>
-#ifndef IN_GC
+#ifndef IN_RC
 # include <iprt/mem.h>
 # include <iprt/mp.h>
@@ -66 +66 @@
 #include <iprt/system.h>
 #include <iprt/table.h>
-#ifndef IN_GC
+#ifndef IN_RC
 # include <iprt/thread.h>
 #endif

trunk/include/iprt/thread.h

@@ -35 +35 @@
 #include <iprt/stdarg.h>
 
-#ifdef IN_GC
+#ifdef IN_RC
 # error "There are no threading APIs available Guest Context!"
 #endif

trunk/include/iprt/time.h

@@ -836 +836 @@
 #endif
 
-#ifndef IN_GC
+#ifndef IN_RC
 /**
  * The RC layout of the RTTIMENANOTSDATA structure.

trunk/include/iprt/types.h

@@ -622 +622 @@
 
 /** HC pointer. */
-#ifndef IN_GC
+#ifndef IN_RC
 typedef void *          RTHCPTR;
 #else
@@ -914 +914 @@
  * HC and void pointer in RC.
  */
-#ifdef IN_GC
+#ifdef IN_RC
 typedef void *          RTRCPTR;
 #else
@@ -959 +959 @@
 
 /** Current Context Physical Memory Address.*/
-#ifdef IN_GC
+#ifdef IN_RC
 typedef RTGCPHYS RTCCPHYS;
 #else
@@ -973 +973 @@
  * to the NULL pointer.
  */
-#ifdef IN_GC
+#ifdef IN_RC
 # define NIL_RTCCPHYS   NIL_RTGCPHYS
 #else