From 41a7950cfb153953096cb37c5bb7a16b8d1072b1 Mon Sep 17 00:00:00 2001
From: Aaron Smith <aaron.smith@microsoft.com>
Date: Tue, 2 Apr 2019 17:10:12 +0000
Subject: [PATCH] [lldb-server] Use llgs namespace to avoid conflicts with
 Win32 API

llvm-svn: 357496
---
 lldb/tools/lldb-server/lldb-server.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lldb/tools/lldb-server/lldb-server.cpp b/lldb/tools/lldb-server/lldb-server.cpp
index 8d126b1..03258bd 100644
--- a/lldb/tools/lldb-server/lldb-server.cpp
+++ b/lldb/tools/lldb-server/lldb-server.cpp
@@ -36,6 +36,7 @@ static void display_usage(const char *progname) {
 int main_gdbserver(int argc, char *argv[]);
 int main_platform(int argc, char *argv[]);
 
+namespace llgs {
 static void initialize() {
   if (auto e = g_debugger_lifetime->Initialize(
           llvm::make_unique<SystemInitializerLLGS>(), nullptr))
@@ -43,6 +44,7 @@ static void initialize() {
 }
 
 static void terminate() { g_debugger_lifetime->Terminate(); }
+} // namespace llgs
 
 //----------------------------------------------------------------------
 // main
@@ -61,14 +63,14 @@ int main(int argc, char *argv[]) {
 
   switch (argv[1][0]) {
   case 'g':
-    initialize();
+    llgs::initialize();
     main_gdbserver(argc, argv);
-    terminate();
+    llgs::terminate();
     break;
   case 'p':
-    initialize();
+    llgs::initialize();
     main_platform(argc, argv);
-    terminate();
+    llgs::terminate();
     break;
   case 'v':
     fprintf(stderr, "%s\n", lldb_private::GetVersion());
-- 
2.7.4