Delete Host/windows/win32.h

It's always hard to remember when to include this file, and
when you do include it it's hard to remember what preprocessor
check it needs to be behind, and then you further have to remember
whether it's windows.h or win32.h which you need to include.

This patch changes the name to PosixApi.h, which is more appropriately
named, and makes it independent of any preprocessor setting.

There's still the issue of people not knowing when to include this,
because there's not a well-defined set of things it exposes other
than "whatever is missing on Windows", but at least this should
make it less painful to fix when problems arise.

This patch depends on LLVM revision r278170.

llvm-svn: 278177

4 files changed, 24 insertions, 18 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp
index 01f67913924..72ceb64a6fb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp
@@ -16,15 +16,15 @@ namespace a {
         ~c();
         void func1() 
         {
-            puts (__PRETTY_FUNCTION__);
+            puts (LLVM_PRETTY_FUNCTION);
         }
         void func2() 
         {
-            puts (__PRETTY_FUNCTION__);
+            puts (LLVM_PRETTY_FUNCTION);
         }
         void func3() 
         {
-            puts (__PRETTY_FUNCTION__);
+            puts (LLVM_PRETTY_FUNCTION);
         }
     };
 
@@ -39,11 +39,11 @@ namespace b {
         ~c();
         void func1() 
         {
-            puts (__PRETTY_FUNCTION__);
+            puts (LLVM_PRETTY_FUNCTION);
         }
         void func3() 
         {
-            puts (__PRETTY_FUNCTION__);
+            puts (LLVM_PRETTY_FUNCTION);
         }
     };
 
@@ -58,11 +58,11 @@ namespace c {
         ~d() {}
         void func2() 
         {
-            puts (__PRETTY_FUNCTION__);
+            puts (LLVM_PRETTY_FUNCTION);
         }
         void func3() 
         {
-            puts (__PRETTY_FUNCTION__);
+            puts (LLVM_PRETTY_FUNCTION);
         }
     };
 }
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp
index bfe098a089f..8065057304d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp
@@ -17,7 +17,7 @@ public:
     virtual ~VBase() {}
     void Print() 
     {
-        printf("%p: %s\n%p: m_value = 0x%8.8x\n", this, __PRETTY_FUNCTION__, &m_value, m_value);
+        printf("%p: %s\n%p: m_value = 0x%8.8x\n", this, LLVM_PRETTY_FUNCTION, &m_value, m_value);
     }
     int m_value;
 };
@@ -28,7 +28,7 @@ public:
     Derived1() {};
     void Print ()
     {
-        printf("%p: %s\n", this, __PRETTY_FUNCTION__);
+        printf("%p: %s\n", this, LLVM_PRETTY_FUNCTION);
         VBase::Print();
     }
 
@@ -41,7 +41,7 @@ public:
     
     void Print ()
     {
-        printf("%p: %s\n", this, __PRETTY_FUNCTION__);
+        printf("%p: %s\n", this, LLVM_PRETTY_FUNCTION);
         VBase::Print();
     }
 };
@@ -56,7 +56,7 @@ public:
     {
         printf("%p: %s \n%p: m_joiner1 = 0x%8.8x\n%p: m_joiner2 = 0x%8.8x\n",
                this,
-               __PRETTY_FUNCTION__,
+               LLVM_PRETTY_FUNCTION,
                &m_joiner1,
                m_joiner1,
                &m_joiner2,
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/main.cpp
index 0adf4157731..04c665d1bfe 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/main.cpp
@@ -10,17 +10,17 @@ public:
     
     virtual const char * a()
     {
-        return __PRETTY_FUNCTION__;
+        return LLVM_PRETTY_FUNCTION;
     }
 
     virtual const char * b()
     {
-        return __PRETTY_FUNCTION__;
+        return LLVM_PRETTY_FUNCTION;
     }
 
     virtual const char * c()
     {
-        return __PRETTY_FUNCTION__;
+        return LLVM_PRETTY_FUNCTION;
     }
 protected:
     char m_pad;
@@ -34,7 +34,7 @@ public:
 
     virtual const char * aa()
     {
-        return __PRETTY_FUNCTION__;
+        return LLVM_PRETTY_FUNCTION;
     }
   
 protected:
@@ -50,12 +50,12 @@ public:
     
     virtual const char * a()
     {
-        return __PRETTY_FUNCTION__;
+        return LLVM_PRETTY_FUNCTION;
     }
 
     virtual const char * b()
     {
-        return __PRETTY_FUNCTION__;
+        return LLVM_PRETTY_FUNCTION;
     }
 protected:
     char m_pad;
@@ -70,7 +70,7 @@ public:
     
     virtual const char * a()
     {
-        return __PRETTY_FUNCTION__;
+        return LLVM_PRETTY_FUNCTION;
     }
 protected:
     char m_pad;
diff --git a/lldb/packages/Python/lldbsuite/test/make/test_common.h b/lldb/packages/Python/lldbsuite/test/make/test_common.h
index b0151afb892..575ca62c2fc 100644
--- a/lldb/packages/Python/lldbsuite/test/make/test_common.h
+++ b/lldb/packages/Python/lldbsuite/test/make/test_common.h
@@ -18,6 +18,12 @@
 #include <eh.h>
 #endif
 
+#if defined(_WIN32)
+#define LLVM_PRETTY_FUNCTION __FUNCSIG__
+#else
+#define LLVM_PRETTY_FUNCTION LLVM_PRETTY_FUNCTION
+#endif
+
 
 // On some systems (e.g., some versions of linux) it is not possible to attach to a process
 // without it giving us special permissions. This defines the lldb_enable_attach macro, which