Changeset 1728 in vbox for trunk/src/VBox/Runtime

Timestamp:

Mar 27, 2007 12:09:49 PM (18 years ago)

Author:

vboxsync

Message:

Added missing IN_GUEST to a couple of templates.

Location:

trunk/src/VBox/Runtime

Files:

• r3/init.cpp (modified) (5 diffs)
• timesup.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/init.cpp

@@ -40 +40 @@
 #include <iprt/string.h>
 #include <iprt/param.h>
-#if !defined(IN_GUEST) && !defined(IN_GUEST_R3)
+#ifndef IN_GUEST
 # include <iprt/file.h>
 # include <VBox/sup.h>
@@ -101 +101 @@
     /* no entry log flow, because prefixes and thread may freak out. */
 
-#if !defined(IN_GUEST) && !defined(IN_GUEST_R3)
+#ifndef IN_GUEST
 # ifdef VBOX
     /*
@@ -117 +117 @@
     }
 # endif  /* VBOX */
-#endif /* !IN_GUEST and !IN_GUEST_R3 */
+#endif /* !IN_GUEST */
 
     /*
@@ -131 +131 @@
     }
 
-#if !defined(IN_GUEST) && !defined(IN_GUEST_R3)
+#ifndef IN_GUEST
     if (fInitSUPLib)
     {
@@ -148 +148 @@
     g_u64ProgramStartMilliTS = RTTimeMilliTS();
 
-#if !defined(IN_GUEST) && !defined(IN_GUEST_R3)
+#ifndef IN_GUEST
     /*
      * The threading is initialized we can safely sleep a bit if GIP

trunk/src/VBox/Runtime/timesup.cpp

@@ -36 +36 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-#if !defined(IN_GUEST) && !defined(IN_GUEST_R3)
+#ifndef IN_GUEST
 /** The previously returned nano TS.
  * This handles TSC drift on SMP systems and expired interval.
@@ -63 +63 @@
 DECLINLINE(uint64_t) rtTimeNanoTSInternal(void)
 {
-#if !defined(IN_GUEST) && !defined(IN_GUEST_R3)
+#ifndef IN_GUEST
     uint64_t    u64Delta;
     uint32_t    u32NanoTSFactor0;
@@ -202 +202 @@
 
     return u64;
-#else /* IN_GUEST || IN_GUEST_R3 */
+#else /* IN_GUEST */
     return RTTimeSystemNanoTS();
-#endif /* IN_GUEST || IN_GUEST_R3 */
+#endif /* IN_GUEST */
 }
 
@@ -230 +230 @@
 
 
-#if !defined(IN_GUEST) && !defined(IN_GUEST_R3)
+#ifndef IN_GUEST
 /**
  * Debugging the time api.