Cleaned up my previous submission which had some header search paths that
were not needed and fixed a merge issue.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@112626 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lldb.xcodeproj/project.pbxproj b/lldb.xcodeproj/project.pbxproj
index 41a1eb6..29a2992 100644
--- a/lldb.xcodeproj/project.pbxproj
+++ b/lldb.xcodeproj/project.pbxproj
@@ -2812,10 +2812,7 @@
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_VERSION = 4.2;
- HEADER_SEARCH_PATHS = (
- /System/Library/Frameworks/System.framework/PrivateHeaders,
- /usr/include/python2.6,
- );
+ HEADER_SEARCH_PATHS = /usr/include/python2.6;
INFOPLIST_FILE = "resources/LLDB-Info.plist";
INSTALL_PATH = /Developer/Library/PrivateFrameworks;
LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";
@@ -2868,10 +2865,7 @@
GCC_ENABLE_OBJC_GC = supported;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_VERSION = 4.2;
- HEADER_SEARCH_PATHS = (
- /System/Library/Frameworks/System.framework/PrivateHeaders,
- /usr/include/python2.6,
- );
+ HEADER_SEARCH_PATHS = /usr/include/python2.6;
INFOPLIST_FILE = "resources/LLDB-Info.plist";
INSTALL_PATH = /Developer/Library/PrivateFrameworks;
LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";
@@ -2981,10 +2975,7 @@
GCC_ENABLE_OBJC_GC = supported;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_VERSION = 4.2;
- HEADER_SEARCH_PATHS = (
- /System/Library/Frameworks/System.framework/PrivateHeaders,
- /usr/include/python2.6,
- );
+ HEADER_SEARCH_PATHS = /usr/include/python2.6;
INFOPLIST_FILE = "resources/LLDB-Info.plist";
INSTALL_PATH = /Developer/Library/PrivateFrameworks;
LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";
diff --git a/source/Host/macosx/Host.mm b/source/Host/macosx/Host.mm
index 00450ac..facc4b4 100644
--- a/source/Host/macosx/Host.mm
+++ b/source/Host/macosx/Host.mm
@@ -834,6 +834,7 @@
file_and_line_desc.descKey = keyAEPosition;
+ static std::string g_app_name;
static FSRef g_app_fsref;
LSApplicationParameters app_params;
@@ -846,11 +847,10 @@
if (external_editor)
{
- bool calculate_fsref = true;
if (log)
log->Printf("Looking for external editor \"%s\".\n", external_editor);
- if (app_name.empty() || strcmp (app_name.c_str(), external_editor) != 0)
+ if (g_app_name.empty() || strcmp (g_app_name.c_str(), external_editor) != 0)
{
CFCString editor_name (external_editor, kCFStringEncodingUTF8);
error = ::LSFindApplicationForInfo (kLSUnknownCreator,