Changeset 3701 in vbox
- Timestamp:
- Jul 18, 2007 7:27:21 PM (18 years ago)
- svn:sync-xref-src-repo-rev:
- 22993
- Location:
- trunk/src/VBox/Frontends
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VBoxBFE/HostUSBImpl.cpp
r3670 r3701 27 27 #include <string> 28 28 29 #ifdef __LINUX__29 #ifdef RT_OS_LINUX 30 30 #include <sys/types.h> 31 31 #include <sys/stat.h> … … 40 40 #include <linux/cdrom.h> 41 41 #include <errno.h> 42 #endif /* __LINUX __*/42 #endif /* RT_OS_LINUX */ 43 43 44 44 #include "HostUSBImpl.h" … … 86 86 87 87 /* 88 #ifdef __LINUX__88 #ifdef RT_OS_LINUX 89 89 mUSBProxyService = new USBProxyServiceLinux (this); 90 #elif defined __WIN__90 #elif defined RT_OS_WINDOWS 91 91 mUSBProxyService = new USBProxyServiceWin32 (this); 92 92 */ -
trunk/src/VBox/Frontends/VBoxBFE/Logging.h
r2981 r3701 39 39 * Helpful macro to trace execution. 40 40 */ 41 #define LogTrace() \42 LogFlow((">>>>> %s (%d): %s\n", __FILE__, __LINE__, __PRETTY_FUNCTION__))43 44 /**45 * Helper macro to print the current reference count of the given COM object46 * to the log file.47 * @param obj object in question (must be a pointer to an IUnknown subclass)48 */49 #define LogComRefCnt(obj) \50 do { \51 int refc = (obj)->AddRef(); refc --; \52 LogFlow (("{%p} " #obj ".refcount=%d\n", (obj), refc)); \53 (obj)->Release(); \54 } while (0)55 41 56 42 #if defined(DEBUG) || defined(LOG_ENABLED) 57 # define V_DEBUG(m) V_LOG(m)58 #if defined(__WIN__)59 # define V_LOG(m) \60 do { Log (("[MAIN:%05u] ", GetCurrentThreadId())); Log (m); Log (("\n")); } while (0)61 # define V_LOG2(m) \62 do { Log2 (("[MAIN:%05u] ", GetCurrentThreadId())); Log2 (m); Log2 (("\n")); } while (0)63 # define V_LOGFLOW(m) \64 do { LogFlow (("[MAIN:%05u] ", GetCurrentThreadId())); LogFlow (m); LogFlow (("\n")); } while (0)65 # define V_LOGFLOWMEMBER(m) \66 do { LogFlow (("[MAIN:%05u] {%p} ", GetCurrentThreadId(), this)); LogFlow (m); LogFlow (("\n")); } while (0)67 # define V_ASSERTMSG(m, e) \68 AssertMsg(e, m)69 # define V_ASSERTFAILED(m) \70 AssertMsgFailed(m)71 #else72 # define V_LOG(m) \73 do { Log (("[MAIN:%RTnthrd] ", RTThreadNativeSelf())); Log (m); Log (("\n")); } while (0)74 # define V_LOG2(m) \75 do { Log2 (("[MAIN:%RTnthrd] ", RTThreadNativeSelf())); Log2 (m); Log2 (("\n")); } while (0)76 # define V_LOGFLOW(m) \77 do { LogFlow (("[MAIN:%RTnthrd] ", RTThreadNativeSelf())); LogFlow (m); LogFlow (("\n")); } while (0)78 # define V_LOGFLOWMEMBER(m) \79 do { LogFlow (("[MAIN:%RTnthrd] {%p} ", RTThreadNativeSelf(), this)); LogFlow (m); LogFlow (("\n")); } while (0)80 # define V_ASSERTMSG(m, e) \81 AssertMsg(e, m)82 # define V_ASSERTFAILED(m) \83 AssertMsgFailed(m)84 #endif85 43 # define LogFlowMember(m) \ 86 44 do { LogFlow (("{%p} ", this)); LogFlow (m); } while (0) 87 45 #else // if !DEBUG 88 # define V_DEBUG(m) do {} while (0)89 # define V_LOG(m) do {} while (0)90 # define V_LOG2(m) do {} while (0)91 # define V_LOGFLOW(m) do {} while (0)92 # define V_LOGFLOWMEMBER(m) do {} while (0)93 # define V_ASSERTMSG(m, e) do {} while (0)94 # define V_ASSERTFAILED(m) do {} while (0)95 46 # define LogFlowMember(m) do {} while (0) 96 47 #endif // !DEBUG -
trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp
r3669 r3701 171 171 *address = mScreen 172 172 ? (uintptr_t)mScreen->pixels 173 #ifdef __OS2__/* Play safe for now - this is vital when we get a larger surface than requested. */173 #ifdef RT_OS_OS2 /* Play safe for now - this is vital when we get a larger surface than requested. */ 174 174 + mScreen->offset 175 175 #endif -
trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp
r3619 r3701 69 69 # define NS_GET_IID(I) IID_##I 70 70 #endif 71 #ifndef __WIN__71 #ifndef RT_OS_WINDOWS 72 72 #define IUnknown nsISupports 73 73 #endif … … 228 228 static void printUsage(USAGECATEGORY u64Cmd) 229 229 { 230 #ifdef __LINUX__230 #ifdef RT_OS_LINUX 231 231 bool fLinux = true; 232 232 #else 233 233 bool fLinux = false; 234 234 #endif 235 #ifdef __WIN__235 #ifdef RT_OS_WINDOWS 236 236 bool fWin = true; 237 237 #else 238 238 bool fWin = false; 239 239 #endif 240 #ifdef __DARWIN__240 #ifdef RT_OS_DARWIN 241 241 bool fDarwin = true; 242 242 #else … … 1704 1704 } 1705 1705 } 1706 #ifdef __WIN__1706 #ifdef RT_OS_WINDOWS 1707 1707 else 1708 1708 if (strcmp(argv[0], "hostifs") == 0) … … 1730 1730 } 1731 1731 } 1732 #endif /* __WIN__*/1732 #endif /* RT_OS_WINDOWS */ 1733 1733 else 1734 1734 if (strcmp(argv[0], "hdds") == 0) … … 2414 2414 static int handleConvertDDImage(int argc, char *argv[]) 2415 2415 { 2416 #ifdef __LINUX__2416 #ifdef RT_OS_LINUX 2417 2417 const bool fReadFromStdIn = (argc >= 1) && !strcmp(argv[0], "stdin"); 2418 2418 #else … … 2823 2823 std::vector <char *> hostifdev (NetworkAdapterCount, 0); 2824 2824 std::vector <const char *> intnet (NetworkAdapterCount, 0); 2825 #ifdef __LINUX__2825 #ifdef RT_OS_LINUX 2826 2826 std::vector <char *> tapsetup (NetworkAdapterCount, 0); 2827 2827 std::vector <char *> tapterm (NetworkAdapterCount, 0); … … 3160 3160 i++; 3161 3161 } 3162 #ifdef __LINUX__3162 #ifdef RT_OS_LINUX 3163 3163 else if (strncmp(argv[i], "-tapsetup", 9) == 0) 3164 3164 { … … 3185 3185 i++; 3186 3186 } 3187 #endif /* __LINUX__*/3187 #endif /* RT_OS_LINUX */ 3188 3188 else if (strncmp(argv[i], "-macaddress", 11) == 0) 3189 3189 { … … 3307 3307 uarts_server[n - 1] = argv[i]; 3308 3308 i++; 3309 #ifdef __WIN__3309 #ifdef RT_OS_WINDOWS 3310 3310 if (strncmp(argv[i], "\\\\.\\pipe\\", 9)) 3311 3311 return errorArgument("Uart pipe must start with \\\\.\\pipe\\"); … … 3796 3796 CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); 3797 3797 } 3798 #ifdef __WIN__3798 #ifdef RT_OS_WINDOWS 3799 3799 #ifdef VBOX_WITH_WINMM 3800 3800 else if (strcmp(audio, "winmm") == 0) … … 3809 3809 CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); 3810 3810 } 3811 #endif /* __WIN__*/3812 #ifdef __LINUX__3811 #endif /* RT_OS_WINDOWS */ 3812 #ifdef RT_OS_LINUX 3813 3813 else if (strcmp(audio, "oss") == 0) 3814 3814 { … … 3823 3823 } 3824 3824 # endif 3825 #endif /* ! __LINUX__*/3826 #ifdef __DARWIN__3825 #endif /* !RT_OS_LINUX */ 3826 #ifdef RT_OS_DARWIN 3827 3827 else if (strcmp(audio, "coreaudio") == 0) 3828 3828 { … … 3830 3830 CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); 3831 3831 } 3832 #endif /* ! __DARWIN__*/3832 #endif /* !RT_OS_DARWIN */ 3833 3833 else 3834 3834 { … … 4016 4016 } 4017 4017 4018 #ifdef __LINUX__4018 #ifdef RT_OS_LINUX 4019 4019 /* the TAP setup application? */ 4020 4020 if (tapsetup[n]) … … 4044 4044 } 4045 4045 } 4046 #endif /* __LINUX__*/4046 #endif /* RT_OS_LINUX */ 4047 4047 4048 4048 } … … 5191 5191 } 5192 5192 5193 #ifdef __WIN__5193 #ifdef RT_OS_WINDOWS 5194 5194 static int handleCreateHostIF(int argc, char *argv[], 5195 5195 ComPtr<IVirtualBox> virtualBox, ComPtr<ISession> session) … … 5277 5277 return SUCCEEDED(rc) ? 0 : 1; 5278 5278 } 5279 #endif /* __WIN__*/5279 #endif /* RT_OS_WINDOWS */ 5280 5280 5281 5281 static int handleGetExtraData(int argc, char *argv[], … … 6422 6422 { "unregisterimage", handleUnregisterImage }, 6423 6423 { "showvdiinfo", handleShowVDIInfo }, 6424 #ifdef __WIN__6424 #ifdef RT_OS_WINDOWS 6425 6425 { "createhostif", handleCreateHostIF }, 6426 6426 { "removehostif", handleRemoveHostIF }, -
trunk/src/VBox/Frontends/VirtualBox/include/XKeyboard.h
r2981 r3701 24 24 #define __XKeyboard_h__ 25 25 26 #ifndef __LINUX__26 #ifndef RT_OS_LINUX 27 27 #error This file is X11/Linux specific! 28 28 #endif -
trunk/src/VBox/Frontends/VirtualBox/src/COMDefs.cpp
r2981 r3701 109 109 #if defined (VBOX_WITH_XPCOM) 110 110 111 #if !defined ( __DARWIN__) && !defined (__OS2__)111 #if !defined (RT_OS_DARWIN) && !defined (RT_OS_OS2) 112 112 113 113 if (NS_SUCCEEDED (rc)) … … 168 168 if (NS_SUCCEEDED (rc) && isOnMainThread) 169 169 { 170 # if !defined ( __DARWIN__) && !defined (__OS2__)170 # if !defined (RT_OS_DARWIN) && !defined (RT_OS_OS2) 171 171 if (sSocketListener) 172 172 { -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp
r3674 r3701 1735 1735 if (focus) 1736 1736 { 1737 #ifdef __WIN__1737 #ifdef RT_OS_WINDOWS 1738 1738 if ( gs.autoCapture() 1739 1739 && GetAncestor (winId(), GA_ROOT) == GetForegroundWindow()) 1740 1740 #else 1741 1741 if (gs.autoCapture()) 1742 #endif /* __WIN__*/1742 #endif /* RT_OS_WINDOWS */ 1743 1743 { 1744 1744 captureKbd (true); -
trunk/src/VBox/Frontends/VirtualBox/src/darwin/DarwinCursor.cpp
r2981 r3701 876 876 g++ -g \ 877 877 -framework IOKit -framework Carbon -framework QuickTime \ 878 -D __DARWIN__-DIN_RING3 -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DTESTING \878 -DRT_OS_DARWIN -DIN_RING3 -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DTESTING \ 879 879 -I include/ \ 880 880 -I ../../../../include \ -
trunk/src/VBox/Frontends/VirtualBox/src/main.cpp
r3671 r3701 48 48 #endif 49 49 #include <ucontext.h> 50 #ifdef __AMD64__50 #ifdef RT_ARCH_AMD64 51 51 # define REG_PC REG_RIP 52 52 #else
Note:
See TracChangeset
for help on using the changeset viewer.