commit fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d
author Brian Carlstrom <bdc@google.com> Wed Jul 17 14:40:12 2013 -0700
committer Brian Carlstrom <bdc@google.com> Wed Jul 17 16:49:05 2013 -0700
tree 5fc7f5b941724a62f8e3411df09fae431ff5e3cf
parent 56d947fbc9bc2992e2f93112fafb73e50d2aaa7a

Fix multiple inclusion guards to match new pathnames

Change-Id: Id7735be1d75bc315733b1773fba45c1deb8ace43

compiler/jni/portable/jni_compiler.h

diff --git a/compiler/jni/portable/jni_compiler.h b/compiler/jni/portable/jni_compiler.h
index a04277c..9bdf35e 100644
--- a/compiler/jni/portable/jni_compiler.h
+++ b/compiler/jni/portable/jni_compiler.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_
-#define ART_SRC_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_
+#ifndef ART_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_
+#define ART_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_
 
 #include <stdint.h>
 
@@ -84,4 +84,4 @@
 }  // namespace art
 
 
-#endif  // ART_SRC_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_
+#endif  // ART_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_

compiler/jni/quick/arm/calling_convention_arm.h

diff --git a/compiler/jni/quick/arm/calling_convention_arm.h b/compiler/jni/quick/arm/calling_convention_arm.h
index 3787d45..f188700 100644
--- a/compiler/jni/quick/arm/calling_convention_arm.h
+++ b/compiler/jni/quick/arm/calling_convention_arm.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_OAT_JNI_ARM_CALLING_CONVENTION_ARM_H_
-#define ART_SRC_OAT_JNI_ARM_CALLING_CONVENTION_ARM_H_
+#ifndef ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_
+#define ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_
 
 #include "jni/quick/calling_convention.h"
 
@@ -85,4 +85,4 @@
 }  // namespace arm
 }  // namespace art
 
-#endif  // ART_SRC_OAT_JNI_ARM_CALLING_CONVENTION_ARM_H_
+#endif  // ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_

compiler/jni/quick/calling_convention.h

diff --git a/compiler/jni/quick/calling_convention.h b/compiler/jni/quick/calling_convention.h
index 121d1f8..d492b42 100644
--- a/compiler/jni/quick/calling_convention.h
+++ b/compiler/jni/quick/calling_convention.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_OAT_JNI_CALLING_CONVENTION_H_
-#define ART_SRC_OAT_JNI_CALLING_CONVENTION_H_
+#ifndef ART_COMPILER_JNI_QUICK_CALLING_CONVENTION_H_
+#define ART_COMPILER_JNI_QUICK_CALLING_CONVENTION_H_
 
 #include <vector>
 #include "oat/utils/managed_register.h"
@@ -286,4 +286,4 @@
 
 }  // namespace art
 
-#endif  // ART_SRC_OAT_JNI_CALLING_CONVENTION_H_
+#endif  // ART_COMPILER_JNI_QUICK_CALLING_CONVENTION_H_

compiler/jni/quick/mips/calling_convention_mips.h

diff --git a/compiler/jni/quick/mips/calling_convention_mips.h b/compiler/jni/quick/mips/calling_convention_mips.h
index 9068136..8412898 100644
--- a/compiler/jni/quick/mips/calling_convention_mips.h
+++ b/compiler/jni/quick/mips/calling_convention_mips.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_OAT_JNI_MIPS_CALLING_CONVENTION_MIPS_H_
-#define ART_SRC_OAT_JNI_MIPS_CALLING_CONVENTION_MIPS_H_
+#ifndef ART_COMPILER_JNI_QUICK_MIPS_CALLING_CONVENTION_MIPS_H_
+#define ART_COMPILER_JNI_QUICK_MIPS_CALLING_CONVENTION_MIPS_H_
 
 #include "jni/quick/calling_convention.h"
 
@@ -83,4 +83,4 @@
 }  // namespace mips
 }  // namespace art
 
-#endif  // ART_SRC_OAT_JNI_MIPS_CALLING_CONVENTION_MIPS_H_
+#endif  // ART_COMPILER_JNI_QUICK_MIPS_CALLING_CONVENTION_MIPS_H_

compiler/jni/quick/x86/calling_convention_x86.h

diff --git a/compiler/jni/quick/x86/calling_convention_x86.h b/compiler/jni/quick/x86/calling_convention_x86.h
index ea8a26e..082c1c8 100644
--- a/compiler/jni/quick/x86/calling_convention_x86.h
+++ b/compiler/jni/quick/x86/calling_convention_x86.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_OAT_JNI_X86_CALLING_CONVENTION_X86_H_
-#define ART_SRC_OAT_JNI_X86_CALLING_CONVENTION_X86_H_
+#ifndef ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_
+#define ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_
 
 #include "jni/quick/calling_convention.h"
 
@@ -80,4 +80,4 @@
 }  // namespace x86
 }  // namespace art
 
-#endif  // ART_SRC_OAT_JNI_X86_CALLING_CONVENTION_X86_H_
+#endif  // ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_