summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Smith <aaron.smith@microsoft.com>2019-04-02 17:10:12 +0000
committerAaron Smith <aaron.smith@microsoft.com>2019-04-02 17:10:12 +0000
commit41a7950cfb153953096cb37c5bb7a16b8d1072b1 (patch)
treeb79eb6c4a863b058b7a26719e0fa058beee36f22
parentb622809b2df19da227d5ea74870f1716f5875b96 (diff)
downloadbcm5719-llvm-41a7950cfb153953096cb37c5bb7a16b8d1072b1.tar.gz
bcm5719-llvm-41a7950cfb153953096cb37c5bb7a16b8d1072b1.zip
[lldb-server] Use llgs namespace to avoid conflicts with Win32 API
llvm-svn: 357496
-rw-r--r--lldb/tools/lldb-server/lldb-server.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/lldb/tools/lldb-server/lldb-server.cpp b/lldb/tools/lldb-server/lldb-server.cpp
index 8d126b10c10..03258bdff0a 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());
OpenPOWER on IntegriCloud