Changeset 676 in vbox for trunk

Timestamp:

Feb 6, 2007 4:26:33 AM (18 years ago)

Author:

vboxsync

Message:

WIN32 -> WIN

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• HostUSBImpl.cpp (modified) (1 diff)
• Logging.h (modified) (1 diff)
• SDLFramebuffer.cpp (modified) (2 diffs)
• SDLFramebuffer.h (modified) (1 diff)
• USBProxyService.h (modified) (1 diff)
• VBoxBFE.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBFE/HostUSBImpl.cpp

@@ -88 +88 @@
 #ifdef __LINUX__
     mUSBProxyService = new USBProxyServiceLinux (this);
-#elif defined __WIN32__
+#elif defined __WIN__
     mUSBProxyService = new USBProxyServiceWin32 (this);
 */

trunk/src/VBox/Frontends/VBoxBFE/Logging.h

@@ -56 +56 @@
 #if defined(DEBUG) || defined(LOG_ENABLED)
 #   define V_DEBUG(m)           V_LOG(m)
-#if defined(__WIN32__)
+#if defined(__WIN__)
 #   define V_LOG(m)             \
     do { Log (("[MAIN:%05u] ", GetCurrentThreadId())); Log (m); Log (("\n")); } while (0)

trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp

@@ -51 +51 @@
     LogFlow(("SDLFramebuffer::SDLFramebuffer\n"));
 
-#if defined (__WIN32__)
+#if defined (__WIN__)
     refcnt = 0;
 #endif
@@ -343 +343 @@
     {
         sdlFlags |= SDL_FULLSCREEN;
-#ifdef __WIN32__
+#ifdef __WIN__
         /* this flag causes a crash on Windows, mScreen->pixels is NULL */
         sdlFlags &= ~SDL_HWSURFACE;

trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.h

@@ -98 +98 @@
     uint32_t mLabelHeight;
 #endif
-#ifdef __WIN32__
+#ifdef __WIN__
     long refcnt;
 #endif

trunk/src/VBox/Frontends/VBoxBFE/USBProxyService.h

@@ -215 +215 @@
 
 
-#ifdef __WIN32__
+#ifdef __WIN__
 /**
- * The Win32 hosted USB Proxy Service.
+ * The Win32/Win64 hosted USB Proxy Service.
  */
 class USBProxyServiceWin32 : public USBProxyService

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -1583 +1583 @@
         rc = CFGMR3InsertString(pLunL0, "Driver",               "AUDIO");           CHECK_RC();
         rc = CFGMR3InsertNode(pLunL0,   "Config", &pCfg);                           CHECK_RC();
-#ifdef __WIN32__
+#ifdef __WIN__
         rc = CFGMR3InsertString(pCfg, "AudioDriver", "winmm");                      CHECK_RC();
-#else /* !__WIN32__ */
+#else /* !__WIN__ */
         rc = CFGMR3InsertString(pCfg, "AudioDriver", "oss");                        CHECK_RC();
-#endif /* !__WIN32__ */
+#endif /* !__WIN__ */
     }