Issue 39002: Breakpad DWARF parser: Move DWARF parser to platform-independent directory.

Move the DWARF parser, and the functioninfo.cc DWARF consumer, from
src/common/mac/dwarf to src/commmon/dwarf, so that it can be shared
between the Mac and Linux dumpers.

Fix up #include directives, multiple inclusion protection macros, and
Xcode build files.

a=jimblandy, r=nealsid


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@446 4c0a9323-5329-0410-9bdc-e9ce6186880e

12 files changed, 34 insertions, 34 deletions

diff --git a/src/common/mac/dwarf/bytereader-inl.h b/src/common/dwarf/bytereader-inl.h
index daf91206..606a2713 100644
--- a/src/common/mac/dwarf/bytereader-inl.h
+++ b/src/common/dwarf/bytereader-inl.h
@@ -29,7 +29,7 @@
 #ifndef UTIL_DEBUGINFO_BYTEREADER_INL_H__
 #define UTIL_DEBUGINFO_BYTEREADER_INL_H__
 
-#include "common/mac/dwarf/bytereader.h"
+#include "common/dwarf/bytereader.h"
 
 namespace dwarf2reader {
 
diff --git a/src/common/mac/dwarf/bytereader.cc b/src/common/dwarf/bytereader.cc
index 906fbb32..7ef68eb0 100644
--- a/src/common/mac/dwarf/bytereader.cc
+++ b/src/common/dwarf/bytereader.cc
@@ -28,8 +28,8 @@
 
 #include <assert.h>
 
-#include "common/mac/dwarf/bytereader-inl.h"
-#include "common/mac/dwarf/bytereader.h"
+#include "common/dwarf/bytereader-inl.h"
+#include "common/dwarf/bytereader.h"
 
 namespace dwarf2reader {
 
diff --git a/src/common/mac/dwarf/bytereader.h b/src/common/dwarf/bytereader.h
index 299dd9ac..72dbb4cf 100644
--- a/src/common/mac/dwarf/bytereader.h
+++ b/src/common/dwarf/bytereader.h
@@ -26,11 +26,11 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef COMMON_MAC_DWARF_BYTEREADER_H__
-#define COMMON_MAC_DWARF_BYTEREADER_H__
+#ifndef COMMON_DWARF_BYTEREADER_H__
+#define COMMON_DWARF_BYTEREADER_H__
 
 #include <string>
-#include "common/mac/dwarf/types.h"
+#include "common/dwarf/types.h"
 
 namespace dwarf2reader {
 
@@ -129,4 +129,4 @@ class ByteReader {
 
 }  // namespace dwarf2reader
 
-#endif  // COMMON_MAC_DWARF_BYTEREADER_H__
+#endif  // COMMON_DWARF_BYTEREADER_H__
diff --git a/src/common/mac/dwarf/dwarf2enums.h b/src/common/dwarf/dwarf2enums.h
index c52e2b47..8f990430 100644
--- a/src/common/mac/dwarf/dwarf2enums.h
+++ b/src/common/dwarf/dwarf2enums.h
@@ -26,8 +26,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef COMMON_MAC_DWARF_DWARF2ENUMS_H__
-#define COMMON_MAC_DWARF_DWARF2ENUMS_H__
+#ifndef COMMON_DWARF_DWARF2ENUMS_H__
+#define COMMON_DWARF_DWARF2ENUMS_H__
 
 namespace dwarf2reader {
 
@@ -487,4 +487,4 @@ enum DwarfOpcode {
 };
 
 }  // namespace dwarf2reader
-#endif  // COMMON_MAC_DWARF_DWARF2ENUMS_H__
+#endif  // COMMON_DWARF_DWARF2ENUMS_H__
diff --git a/src/common/mac/dwarf/dwarf2reader.cc b/src/common/dwarf/dwarf2reader.cc
index e43029cc..99acbe1f 100644
--- a/src/common/mac/dwarf/dwarf2reader.cc
+++ b/src/common/dwarf/dwarf2reader.cc
@@ -31,10 +31,10 @@
 #include <stack>
 #include <utility>
 
-#include "common/mac/dwarf/bytereader-inl.h"
-#include "common/mac/dwarf/dwarf2reader.h"
-#include "common/mac/dwarf/bytereader.h"
-#include "common/mac/dwarf/line_state_machine.h"
+#include "common/dwarf/bytereader-inl.h"
+#include "common/dwarf/dwarf2reader.h"
+#include "common/dwarf/bytereader.h"
+#include "common/dwarf/line_state_machine.h"
 
 namespace dwarf2reader {
 
diff --git a/src/common/mac/dwarf/dwarf2reader.h b/src/common/dwarf/dwarf2reader.h
index cb47d97f..eb9dc319 100644
--- a/src/common/mac/dwarf/dwarf2reader.h
+++ b/src/common/dwarf/dwarf2reader.h
@@ -33,8 +33,8 @@
 // reading if you wish to modify the implementation.
 // Only a cursory attempt is made to explain terminology that is
 // used here, as it is much better explained in the standard documents
-#ifndef COMMON_MAC_DWARF_DWARF2READER_H__
-#define COMMON_MAC_DWARF_DWARF2READER_H__
+#ifndef COMMON_DWARF_DWARF2READER_H__
+#define COMMON_DWARF_DWARF2READER_H__
 
 #include <list>
 #include <map>
@@ -42,8 +42,8 @@
 #include <utility>
 #include <vector>
 
-#include "common/mac/dwarf/dwarf2enums.h"
-#include "common/mac/dwarf/types.h"
+#include "common/dwarf/dwarf2enums.h"
+#include "common/dwarf/types.h"
 
 using namespace std;
 
diff --git a/src/common/mac/dwarf/functioninfo.cc b/src/common/dwarf/functioninfo.cc
index 04165dc0..1957153e 100644
--- a/src/common/mac/dwarf/functioninfo.cc
+++ b/src/common/dwarf/functioninfo.cc
@@ -35,9 +35,9 @@
 #include <queue>
 #include <vector>
 
-#include "common/mac/dwarf/functioninfo.h"
+#include "common/dwarf/functioninfo.h"
 
-#include "common/mac/dwarf/bytereader.h"
+#include "common/dwarf/bytereader.h"
 
 
 namespace dwarf2reader {
diff --git a/src/common/mac/dwarf/functioninfo.h b/src/common/dwarf/functioninfo.h
index 130f182e..ad42ec74 100644
--- a/src/common/mac/dwarf/functioninfo.h
+++ b/src/common/dwarf/functioninfo.h
@@ -31,15 +31,15 @@
 // collector that uses the DWARF2/3 reader interface to build a mapping
 // of addresses to files, lines, and functions.
 
-#ifndef COMMON_MAC_DWARF_FUNCTIONINFO_H__
-#define COMMON_MAC_DWARF_FUNCTIONINFO_H__
+#ifndef COMMON_DWARF_FUNCTIONINFO_H__
+#define COMMON_DWARF_FUNCTIONINFO_H__
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "common/mac/dwarf/dwarf2reader.h"
+#include "common/dwarf/dwarf2reader.h"
 
 
 namespace dwarf2reader {
@@ -175,4 +175,4 @@ class CUFunctionInfoHandler: public Dwarf2Handler {
 };
 
 }  // namespace dwarf2reader
-#endif  // COMMON_MAC_DWARF_FUNCTIONINFO_H__
+#endif  // COMMON_DWARF_FUNCTIONINFO_H__
diff --git a/src/common/mac/dwarf/line_state_machine.h b/src/common/dwarf/line_state_machine.h
index 4ba98f74..6f9fb72b 100644
--- a/src/common/mac/dwarf/line_state_machine.h
+++ b/src/common/dwarf/line_state_machine.h
@@ -27,8 +27,8 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-#ifndef COMMON_MAC_DWARF_LINE_STATE_MACHINE_H__
-#define COMMON_MAC_DWARF_LINE_STATE_MACHINE_H__
+#ifndef COMMON_DWARF_LINE_STATE_MACHINE_H__
+#define COMMON_DWARF_LINE_STATE_MACHINE_H__
 
 namespace dwarf2reader {
 
@@ -58,4 +58,4 @@ struct LineStateMachine {
 }  // namespace dwarf2reader
 
 
-#endif  // COMMON_MAC_DWARF_LINE_STATE_MACHINE_H__
+#endif  // COMMON_DWARF_LINE_STATE_MACHINE_H__
diff --git a/src/common/mac/dwarf/types.h b/src/common/dwarf/types.h
index 76541597..5f49ff9d 100644
--- a/src/common/mac/dwarf/types.h
+++ b/src/common/dwarf/types.h
@@ -30,8 +30,8 @@
 // This file contains some typedefs for basic types
 
 
-#ifndef _COMMON_MAC_DWARF_TYPES_H__
-#define _COMMON_MAC_DWARF_TYPES_H__
+#ifndef _COMMON_DWARF_TYPES_H__
+#define _COMMON_DWARF_TYPES_H__
 
 typedef signed char         int8;
 typedef short               int16;
@@ -43,4 +43,4 @@ typedef unsigned short     uint16;
 typedef unsigned int       uint32;
 typedef unsigned long long uint64;
 
-#endif // _COMMON_MAC_DWARF_TYPES_H__
+#endif // _COMMON_DWARF_TYPES_H__
diff --git a/src/common/mac/dump_syms.h b/src/common/mac/dump_syms.h
index 5ed3e3b6..1acaf44a 100644
--- a/src/common/mac/dump_syms.h
+++ b/src/common/mac/dump_syms.h
@@ -33,7 +33,7 @@
 
 #import <Foundation/Foundation.h>
 #include <mach-o/loader.h>
-#include "common/mac/dwarf/dwarf2reader.h"
+#include "common/dwarf/dwarf2reader.h"
 
 // This will map from an architecture string to a SectionMap, which
 // will contain the offsets for all the sections in the dictionary
diff --git a/src/common/mac/dump_syms.mm b/src/common/mac/dump_syms.mm
index 8f0b9fe1..cf70b1c6 100644
--- a/src/common/mac/dump_syms.mm
+++ b/src/common/mac/dump_syms.mm
@@ -47,9 +47,9 @@
 #import "dump_syms.h"
 #import "common/mac/file_id.h"
 #import "common/mac/macho_utilities.h"
-#import "common/mac/dwarf/dwarf2reader.h"
-#import "common/mac/dwarf/functioninfo.h"
-#import "common/mac/dwarf/bytereader.h"
+#import "common/dwarf/dwarf2reader.h"
+#import "common/dwarf/functioninfo.h"
+#import "common/dwarf/bytereader.h"
 
 using google_breakpad::FileID;