Change header paths and include guards to be relative to the "src" directory. r=mmentovai.
http://groups.google.com/group/airbag-dev/msg/cbe061dd563e9d17
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@10 4c0a9323-5329-0410-9bdc-e9ce6186880e
diff --git a/src/google/airbag_types.h b/src/google/airbag_types.h
index 758b09e..027c367 100644
--- a/src/google/airbag_types.h
+++ b/src/google/airbag_types.h
@@ -22,8 +22,8 @@
*
* Author: Mark Mentovai */
-#ifndef _AIRBAG_TYPES_H__
-#define _AIRBAG_TYPES_H__
+#ifndef GOOGLE_AIRBAG_TYPES_H__
+#define GOOGLE_AIRBAG_TYPES_H__
#ifndef _WIN32
@@ -43,4 +43,4 @@
typedef u_int64_t airbag_time_t;
-#endif /* _AIRBAG_TYPES_H__ */
+#endif /* GOOGLE_AIRBAG_TYPES_H__ */
diff --git a/src/google/crash_report.h b/src/google/crash_report.h
index dd4bc91..96ba6f1 100644
--- a/src/google/crash_report.h
+++ b/src/google/crash_report.h
@@ -16,13 +16,13 @@
// including data sent with the report and data derived by the minidump
// processor (stack trace, etc.).
-#ifndef _CRASH_REPORT_H__
-#define _CRASH_REPORT_H__
+#ifndef GOOGLE_CRASH_REPORT_H__
+#define GOOGLE_CRASH_REPORT_H__
#include <vector>
#include <string>
-#include "airbag_types.h"
-#include "stack_frame.h"
+#include "google/airbag_types.h"
+#include "google/stack_frame.h"
namespace google_airbag {
@@ -83,4 +83,4 @@
} // namespace google_airbag
-#endif // _CRASH_REPORT_H__
+#endif // GOOGLE_CRASH_REPORT_H__
diff --git a/src/google/stack_frame.h b/src/google/stack_frame.h
index 1d06c97..dd3866f 100644
--- a/src/google/stack_frame.h
+++ b/src/google/stack_frame.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef _STACK_FRAME_H__
-#define _STACK_FRAME_H__
+#ifndef GOOGLE_STACK_FRAME_H__
+#define GOOGLE_STACK_FRAME_H__
#include <vector>
-#include "airbag_types.h"
+#include "google/airbag_types.h"
namespace google_airbag {
@@ -55,4 +55,4 @@
} // namespace google_airbag
-#endif // _STACK_FRAME_H__
+#endif // GOOGLE_STACK_FRAME_H__
diff --git a/src/processor/source_line_resolver.cc b/src/processor/source_line_resolver.cc
index a99dc41..6ee516e 100644
--- a/src/processor/source_line_resolver.cc
+++ b/src/processor/source_line_resolver.cc
@@ -17,7 +17,7 @@
#include <string.h>
#include <vector>
#include <utility>
-#include "source_line_resolver.h"
+#include "processor/source_line_resolver.h"
using std::map;
using std::vector;
diff --git a/src/processor/source_line_resolver.h b/src/processor/source_line_resolver.h
index 97bfa1d..0d19389 100644
--- a/src/processor/source_line_resolver.h
+++ b/src/processor/source_line_resolver.h
@@ -16,8 +16,8 @@
// It uses address map files produced by a compatible writer, e.g.
// PDBSourceLineWriter.
-#ifndef _SOURCE_LINE_RESOLVER_H__
-#define _SOURCE_LINE_RESOLVER_H__
+#ifndef PROCESSOR_SOURCE_LINE_RESOLVER_H__
+#define PROCESSOR_SOURCE_LINE_RESOLVER_H__
#include "config.h"
#include <string>
@@ -85,4 +85,4 @@
} // namespace google_airbag
-#endif // _SOLURCE_LINE_RESOLVER_H__
+#endif // PROCESSOR_SOURCE_LINE_RESOLVER_H__
diff --git a/src/processor/source_line_resolver_unittest.cc b/src/processor/source_line_resolver_unittest.cc
index 8bfe662..c47edce 100644
--- a/src/processor/source_line_resolver_unittest.cc
+++ b/src/processor/source_line_resolver_unittest.cc
@@ -14,7 +14,7 @@
#include <stdio.h>
#include <string>
-#include "source_line_resolver.h"
+#include "processor/source_line_resolver.h"
using std::string;
using google_airbag::SourceLineResolver;
