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

runtime/base/unix_file/fd_file.h

diff --git a/runtime/base/unix_file/fd_file.h b/runtime/base/unix_file/fd_file.h
index 2b33961..79a0db9 100644
--- a/runtime/base/unix_file/fd_file.h
+++ b/runtime/base/unix_file/fd_file.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef BASE_UNIX_FILE_FD_FILE_H_
-#define BASE_UNIX_FILE_FD_FILE_H_
+#ifndef ART_RUNTIME_BASE_UNIX_FILE_FD_FILE_H_
+#define ART_RUNTIME_BASE_UNIX_FILE_FD_FILE_H_
 
 #include <fcntl.h>
 #include <string>
@@ -72,4 +72,4 @@
 
 }  // namespace unix_file
 
-#endif  // BASE_UNIX_FILE_FD_FILE_H_
+#endif  // ART_RUNTIME_BASE_UNIX_FILE_FD_FILE_H_

runtime/base/unix_file/mapped_file.h

diff --git a/runtime/base/unix_file/mapped_file.h b/runtime/base/unix_file/mapped_file.h
index 161100b..28cc551 100644
--- a/runtime/base/unix_file/mapped_file.h
+++ b/runtime/base/unix_file/mapped_file.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef BASE_UNIX_FILE_MAPPED_FILE_H_
-#define BASE_UNIX_FILE_MAPPED_FILE_H_
+#ifndef ART_RUNTIME_BASE_UNIX_FILE_MAPPED_FILE_H_
+#define ART_RUNTIME_BASE_UNIX_FILE_MAPPED_FILE_H_
 
 #include <fcntl.h>
 #include <string>
@@ -94,4 +94,4 @@
 
 }  // namespace unix_file
 
-#endif  // BASE_UNIX_FILE_MAPPED_FILE_H_
+#endif  // ART_RUNTIME_BASE_UNIX_FILE_MAPPED_FILE_H_

runtime/base/unix_file/null_file.h

diff --git a/runtime/base/unix_file/null_file.h b/runtime/base/unix_file/null_file.h
index e716603..3394731 100644
--- a/runtime/base/unix_file/null_file.h
+++ b/runtime/base/unix_file/null_file.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef BASE_UNIX_FILE_NULL_FILE_H_
-#define BASE_UNIX_FILE_NULL_FILE_H_
+#ifndef ART_RUNTIME_BASE_UNIX_FILE_NULL_FILE_H_
+#define ART_RUNTIME_BASE_UNIX_FILE_NULL_FILE_H_
 
 #include "base/unix_file/random_access_file.h"
 #include "base/macros.h"
@@ -47,4 +47,4 @@
 
 }  // namespace unix_file
 
-#endif  // BASE_UNIX_FILE_NULL_FILE_H_
+#endif  // ART_RUNTIME_BASE_UNIX_FILE_NULL_FILE_H_

runtime/base/unix_file/random_access_file.h

diff --git a/runtime/base/unix_file/random_access_file.h b/runtime/base/unix_file/random_access_file.h
index 22da37f..31a6dbe 100644
--- a/runtime/base/unix_file/random_access_file.h
+++ b/runtime/base/unix_file/random_access_file.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_
-#define BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_
+#ifndef ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_
+#define ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_
 
 #include <stdint.h>
 
@@ -65,4 +65,4 @@
 
 }  // namespace unix_file
 
-#endif  // BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_
+#endif  // ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_

runtime/base/unix_file/random_access_file_test.h

diff --git a/runtime/base/unix_file/random_access_file_test.h b/runtime/base/unix_file/random_access_file_test.h
index 3baaeae..9d8550d 100644
--- a/runtime/base/unix_file/random_access_file_test.h
+++ b/runtime/base/unix_file/random_access_file_test.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_
-#define BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_
+#ifndef ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_
+#define ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_
 
 #include <errno.h>
 
@@ -169,4 +169,4 @@
 
 }  // namespace unix_file
 
-#endif  // BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_
+#endif  // ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_

runtime/base/unix_file/random_access_file_utils.h

diff --git a/runtime/base/unix_file/random_access_file_utils.h b/runtime/base/unix_file/random_access_file_utils.h
index 0535ead..30c81c0 100644
--- a/runtime/base/unix_file/random_access_file_utils.h
+++ b/runtime/base/unix_file/random_access_file_utils.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_
-#define BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_
+#ifndef ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_
+#define ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_
 
 namespace unix_file {
 
@@ -27,4 +27,4 @@
 
 }  // namespace unix_file
 
-#endif  // BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_
+#endif  // ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_

runtime/base/unix_file/string_file.h

diff --git a/runtime/base/unix_file/string_file.h b/runtime/base/unix_file/string_file.h
index 8944373..26904f8 100644
--- a/runtime/base/unix_file/string_file.h
+++ b/runtime/base/unix_file/string_file.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef BASE_UNIX_FILE_STRING_FILE_H_
-#define BASE_UNIX_FILE_STRING_FILE_H_
+#ifndef ART_RUNTIME_BASE_UNIX_FILE_STRING_FILE_H_
+#define ART_RUNTIME_BASE_UNIX_FILE_STRING_FILE_H_
 
 #include <stdint.h>
 
@@ -56,4 +56,4 @@
 
 }  // namespace unix_file
 
-#endif  // BASE_UNIX_FILE_STRING_FILE_H_
+#endif  // ART_RUNTIME_BASE_UNIX_FILE_STRING_FILE_H_