[Lldb-commits] [lldb] r164213 - in /lldb/branches/windows: include/lldb/Host/Mutex.h include/lldb/Host/TimeValue.h include/lldb/Utility/RefCounter.h include/lldb/Utility/SharingPtr.h tools/driver/IOChannel.h

[Carlo Kok]

Author: carlokok
Date: Wed Sep 19 06:30:14 2012
New Revision: 164213

URL: http://llvm.org/viewvc/llvm-project?rev=164213&view=rev
Log:
Windows.h has a "GetUserName" define that scrambles the runtime name of GetUserName to GetUserNameA or GetUserNameW. 

Modified:
    lldb/branches/windows/include/lldb/Host/Mutex.h
    lldb/branches/windows/include/lldb/Host/TimeValue.h
    lldb/branches/windows/include/lldb/Utility/RefCounter.h
    lldb/branches/windows/include/lldb/Utility/SharingPtr.h
    lldb/branches/windows/tools/driver/IOChannel.h

Modified: lldb/branches/windows/include/lldb/Host/Mutex.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/include/lldb/Host/Mutex.h?rev=164213&r1=164212&r2=164213&view=diff
==============================================================================
--- lldb/branches/windows/include/lldb/Host/Mutex.h (original)
+++ lldb/branches/windows/include/lldb/Host/Mutex.h Wed Sep 19 06:30:14 2012
@@ -20,6 +20,7 @@
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
 #include <Windows.h>
+#undef GetUserName
 #endif
 
 #include <assert.h>

Modified: lldb/branches/windows/include/lldb/Host/TimeValue.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/include/lldb/Host/TimeValue.h?rev=164213&r1=164212&r2=164213&view=diff
==============================================================================
--- lldb/branches/windows/include/lldb/Host/TimeValue.h (original)
+++ lldb/branches/windows/include/lldb/Host/TimeValue.h Wed Sep 19 06:30:14 2012
@@ -23,6 +23,7 @@
 // END: MinGW work around
 #else
 #include <winsock2.h>
+#undef GetUserName
 #endif
 
 // C++ Includes

Modified: lldb/branches/windows/include/lldb/Utility/RefCounter.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/include/lldb/Utility/RefCounter.h?rev=164213&r1=164212&r2=164213&view=diff
==============================================================================
--- lldb/branches/windows/include/lldb/Utility/RefCounter.h (original)
+++ lldb/branches/windows/include/lldb/Utility/RefCounter.h Wed Sep 19 06:30:14 2012
@@ -14,6 +14,7 @@
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
 #include <Windows.h>
+#undef GetUserName
 #endif
 
 #include "lldb/lldb-public.h"

Modified: lldb/branches/windows/include/lldb/Utility/SharingPtr.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/include/lldb/Utility/SharingPtr.h?rev=164213&r1=164212&r2=164213&view=diff
==============================================================================
--- lldb/branches/windows/include/lldb/Utility/SharingPtr.h (original)
+++ lldb/branches/windows/include/lldb/Utility/SharingPtr.h Wed Sep 19 06:30:14 2012
@@ -17,6 +17,7 @@
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
 #include <Windows.h>
+#undef GetUserName
 #endif
 
 //#define ENABLE_SP_LOGGING 1 // DON'T CHECK THIS LINE IN UNLESS COMMENTED OUT

Modified: lldb/branches/windows/tools/driver/IOChannel.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/windows/tools/driver/IOChannel.h?rev=164213&r1=164212&r2=164213&view=diff
==============================================================================
--- lldb/branches/windows/tools/driver/IOChannel.h (original)
+++ lldb/branches/windows/tools/driver/IOChannel.h Wed Sep 19 06:30:14 2012
@@ -28,6 +28,7 @@
 struct History;
 struct HistEvent {};
 #include <Winsock2.h>
+#undef GetUserName
 #endif
 
 #include "llvm/Support/Mutex.h"