From f805e1905cc703b23cbd1ee1987e1a2967ee2759 Mon Sep 17 00:00:00 2001
From: Pavel Labath <labath@google.com>
Date: Tue, 7 Jul 2015 10:08:41 +0000
Subject: [PATCH] Fix cmake build after recent JSON changes

I have moved StringExtractor.h into the include/ folder so that it can be properly included by
everyone.

llvm-svn: 241572
---
 lldb/include/lldb/Utility/JSON.h                          | 2 +-
 lldb/{source => include/lldb}/Utility/StringExtractor.h   | 0
 lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp  | 2 +-
 lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h | 2 +-
 lldb/source/Utility/JSON.cpp                              | 2 ++
 lldb/source/Utility/StringExtractor.cpp                   | 2 +-
 lldb/source/Utility/StringExtractorGDBRemote.h            | 2 +-
 7 files changed, 7 insertions(+), 5 deletions(-)
 rename lldb/{source => include/lldb}/Utility/StringExtractor.h (100%)

diff --git a/lldb/include/lldb/Utility/JSON.h b/lldb/include/lldb/Utility/JSON.h
index b5b443b8033d..da5e26dbda28 100644
--- a/lldb/include/lldb/Utility/JSON.h
+++ b/lldb/include/lldb/Utility/JSON.h
@@ -11,7 +11,7 @@
 #define utility_JSON_h_
 
 #include "lldb/Core/Stream.h"
-#include "Utility/StringExtractor.h"
+#include "lldb/Utility/StringExtractor.h"
 
 #include <inttypes.h>
 #include <map>
diff --git a/lldb/source/Utility/StringExtractor.h b/lldb/include/lldb/Utility/StringExtractor.h
similarity index 100%
rename from lldb/source/Utility/StringExtractor.h
rename to lldb/include/lldb/Utility/StringExtractor.h
diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
index 0142935b2b21..41d6b7674a05 100644
--- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
+++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
@@ -40,10 +40,10 @@
 #include "lldb/Target/Target.h"
 #include "lldb/Utility/LLDBAssert.h"
 #include "lldb/Utility/PseudoTerminal.h"
+#include "lldb/Utility/StringExtractor.h"
 
 #include "Plugins/Process/POSIX/ProcessPOSIXLog.h"
 #include "Plugins/Process/Utility/LinuxSignals.h"
-#include "Utility/StringExtractor.h"
 #include "NativeThreadLinux.h"
 #include "ProcFileReader.h"
 #include "Procfs.h"
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
index 0a5e4a8a41b4..2f825d3e1c38 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
@@ -27,11 +27,11 @@
 #include "lldb/Core/ThreadSafeValue.h"
 #include "lldb/Host/HostThread.h"
 #include "lldb/lldb-private-forward.h"
+#include "lldb/Utility/StringExtractor.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/Thread.h"
 
 #include "GDBRemoteCommunicationClient.h"
-#include "Utility/StringExtractor.h"
 #include "GDBRemoteRegisterContext.h"
 
 namespace lldb_private {
diff --git a/lldb/source/Utility/JSON.cpp b/lldb/source/Utility/JSON.cpp
index eaf224d555f0..1e16a5ac9952 100644
--- a/lldb/source/Utility/JSON.cpp
+++ b/lldb/source/Utility/JSON.cpp
@@ -8,6 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Utility/JSON.h"
+
+#include <limits.h>
 #include "lldb/Core/StreamString.h"
 #include "lldb/Host/StringConvert.h"
 
diff --git a/lldb/source/Utility/StringExtractor.cpp b/lldb/source/Utility/StringExtractor.cpp
index bde5e1961d8a..6302c033c0c1 100644
--- a/lldb/source/Utility/StringExtractor.cpp
+++ b/lldb/source/Utility/StringExtractor.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Utility/StringExtractor.h"
+#include "lldb/Utility/StringExtractor.h"
 
 // C Includes
 #include <stdlib.h>
diff --git a/lldb/source/Utility/StringExtractorGDBRemote.h b/lldb/source/Utility/StringExtractorGDBRemote.h
index beb07e5b57ea..cd053b7ad80c 100644
--- a/lldb/source/Utility/StringExtractorGDBRemote.h
+++ b/lldb/source/Utility/StringExtractorGDBRemote.h
@@ -15,7 +15,7 @@
 #include <string>
 // Other libraries and framework includes
 // Project includes
-#include "Utility/StringExtractor.h"
+#include "lldb/Utility/StringExtractor.h"
 
 class StringExtractorGDBRemote : public StringExtractor
 {