[llvm-branch-commits] [lldb] r240294 - Merging r239199:

[Tom Stellard]

Author: tstellar
Date: Mon Jun 22 11:47:19 2015
New Revision: 240294

URL: http://llvm.org/viewvc/llvm-project?rev=240294&view=rev
Log:
Merging r239199:
------------------------------------------------------------------------
r239199 | labath | 2015-06-05 19:14:14 -0400 (Fri, 05 Jun 2015) | 3 lines

Remove unused editline includes

LLDB included editline in a couple of places, not respecting LLDB_DISABLE_LIBEDIT. As far as I can tell, these includes are not used, so I am removing them.
------------------------------------------------------------------------

Differential Revision: http://reviews.llvm.org/D10324

Modified:
    lldb/branches/release_36/   (props changed)
    lldb/branches/release_36/tools/driver/Platform.h
    lldb/branches/release_36/tools/lldb-mi/Platform.h

Propchange: lldb/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 22 11:47:19 2015
@@ -1,3 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
-/lldb/trunk:228057,228710
+/lldb/trunk:228057,228710,239199

Modified: lldb/branches/release_36/tools/driver/Platform.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_36/tools/driver/Platform.h?rev=240294&r1=240293&r2=240294&view=diff
==============================================================================
--- lldb/branches/release_36/tools/driver/Platform.h (original)
+++ lldb/branches/release_36/tools/driver/Platform.h Mon Jun 22 11:47:19 2015
@@ -103,16 +103,6 @@
 
     #include <pthread.h>
     #include <sys/time.h>
-
-#if !defined(__ANDROID_NDK__)
-	#include <histedit.h>
-	#if defined(__FreeBSD__) || defined(__NetBSD__)
-		#include <readline/readline.h>
-	#else
-		#include <editline/readline.h>
-	#endif
-#endif
-
 #endif
 
 #endif // lldb_Platform_h_

Modified: lldb/branches/release_36/tools/lldb-mi/Platform.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_36/tools/lldb-mi/Platform.h?rev=240294&r1=240293&r2=240294&view=diff
==============================================================================
--- lldb/branches/release_36/tools/lldb-mi/Platform.h (original)
+++ lldb/branches/release_36/tools/lldb-mi/Platform.h Mon Jun 22 11:47:19 2015
@@ -96,14 +96,7 @@ extern sighandler_t signal(int sig, sigh
 #include <termios.h>
 #include <unistd.h>
 
-#include <histedit.h>
 #include <pthread.h>
 #include <sys/time.h>
 
-#if defined(__FreeBSD__)
-#include <readline/readline.h>
-#else
-#include <editline/readline.h>
-#endif
-
 #endif