Update include guards.

--
MOS_MIGRATED_REVID=93413161

12 files changed, 36 insertions, 37 deletions

diff --git a/src/main/cpp/blaze_startup_options.h b/src/main/cpp/blaze_startup_options.h
index c0de4fc347..ee006cd9d8 100644
--- a/src/main/cpp/blaze_startup_options.h
+++ b/src/main/cpp/blaze_startup_options.h
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef DEVTOOLS_BLAZE_MAIN_BLAZE_STARTUP_OPTIONS_H_
-#define DEVTOOLS_BLAZE_MAIN_BLAZE_STARTUP_OPTIONS_H_
+#ifndef BAZEL_SRC_MAIN_CPP_BLAZE_STARTUP_OPTIONS_H_
+#define BAZEL_SRC_MAIN_CPP_BLAZE_STARTUP_OPTIONS_H_
 
 #include <map>
 #include <memory>
@@ -215,4 +215,4 @@ class BlazeStartupOptions {
 };
 
 }  // namespace blaze
-#endif  // DEVTOOLS_BLAZE_MAIN_BLAZE_STARTUP_OPTIONS_H_
+#endif  // BAZEL_SRC_MAIN_CPP_BLAZE_STARTUP_OPTIONS_H_
diff --git a/src/main/cpp/blaze_util.h b/src/main/cpp/blaze_util.h
index 7f456e7e04..8bec14db7c 100644
--- a/src/main/cpp/blaze_util.h
+++ b/src/main/cpp/blaze_util.h
@@ -16,8 +16,8 @@
 //               Blaze client.
 //
 
-#ifndef DEVTOOLS_BLAZE_MAIN_BLAZE_UTIL_H_
-#define DEVTOOLS_BLAZE_MAIN_BLAZE_UTIL_H_
+#ifndef BAZEL_SRC_MAIN_CPP_BLAZE_UTIL_H_
+#define BAZEL_SRC_MAIN_CPP_BLAZE_UTIL_H_
 
 #include <string>
 #include <vector>
@@ -110,4 +110,4 @@ bool CheckJavaVersionIsAtLeast(string jvm_version, string version_spec);
 
 }  // namespace blaze
 
-#endif  // DEVTOOLS_BLAZE_MAIN_BLAZE_UTIL_H_
+#endif  // BAZEL_SRC_MAIN_CPP_BLAZE_UTIL_H_
diff --git a/src/main/cpp/blaze_util_platform.h b/src/main/cpp/blaze_util_platform.h
index 2d3101b60c..014254e276 100644
--- a/src/main/cpp/blaze_util_platform.h
+++ b/src/main/cpp/blaze_util_platform.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DEVTOOLS_BLAZE_MAIN_BLAZE_UTIL_PLATFORM_H_
-#define DEVTOOLS_BLAZE_MAIN_BLAZE_UTIL_PLATFORM_H_
+#ifndef BAZEL_SRC_MAIN_CPP_BLAZE_UTIL_PLATFORM_H_
+#define BAZEL_SRC_MAIN_CPP_BLAZE_UTIL_PLATFORM_H_
 
 #include <stdint.h>
 
@@ -56,4 +56,4 @@ std::string GetDefaultHostJavabase();
 
 }  // namespace blaze
 
-#endif  // DEVTOOLS_BLAZE_MAIN_BLAZE_UTIL_PLATFORM_H_
+#endif  // BAZEL_SRC_MAIN_CPP_BLAZE_UTIL_PLATFORM_H_
diff --git a/src/main/cpp/option_processor.h b/src/main/cpp/option_processor.h
index 866b03a36f..9bc7a381ea 100644
--- a/src/main/cpp/option_processor.h
+++ b/src/main/cpp/option_processor.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DEVTOOLS_BLAZE_MAIN_OPTION_PROCESSOR_H_
-#define DEVTOOLS_BLAZE_MAIN_OPTION_PROCESSOR_H_
+#ifndef BAZEL_SRC_MAIN_CPP_OPTION_PROCESSOR_H_
+#define BAZEL_SRC_MAIN_CPP_OPTION_PROCESSOR_H_
 
 #include <list>
 #include <map>
@@ -119,4 +119,4 @@ class OptionProcessor {
 };
 
 }  // namespace blaze
-#endif  // DEVTOOLS_BLAZE_MAIN_OPTION_PROCESSOR_H_
+#endif  // BAZEL_SRC_MAIN_CPP_OPTION_PROCESSOR_H_
diff --git a/src/main/cpp/util/errors.h b/src/main/cpp/util/errors.h
index 5079c6123a..a2b601ca91 100644
--- a/src/main/cpp/util/errors.h
+++ b/src/main/cpp/util/errors.h
@@ -13,8 +13,8 @@
 // limitations under the License.
 //
 
-#ifndef DEVTOOLS_BLAZE_MAIN_UTIL_ERRORS_H_
-#define DEVTOOLS_BLAZE_MAIN_UTIL_ERRORS_H_
+#ifndef BAZEL_SRC_MAIN_CPP_UTIL_ERRORS_H_
+#define BAZEL_SRC_MAIN_CPP_UTIL_ERRORS_H_
 
 #include "src/main/cpp/util/port.h"
 
@@ -29,4 +29,4 @@ void pdie(const int exit_status, const char *format, ...) ATTRIBUTE_NORETURN
 
 }  // namespace blaze_util
 
-#endif   // DEVTOOLS_BLAZE_MAIN_UTIL_ERRORS_H_
+#endif  // BAZEL_SRC_MAIN_CPP_UTIL_ERRORS_H_
diff --git a/src/main/cpp/util/exit_code.h b/src/main/cpp/util/exit_code.h
index 6cf9cf00de..e918fc4dec 100644
--- a/src/main/cpp/util/exit_code.h
+++ b/src/main/cpp/util/exit_code.h
@@ -16,8 +16,8 @@
 // Must be kept in sync with the Java counterpart under
 // com/google/devtools/build/lib/util/ExitCode.java
 
-#ifndef DEVTOOLS_BLAZE_MAIN_UTIL_EXIT_CODE_H_
-#define DEVTOOLS_BLAZE_MAIN_UTIL_EXIT_CODE_H_
+#ifndef BAZEL_SRC_MAIN_CPP_UTIL_EXIT_CODE_H_
+#define BAZEL_SRC_MAIN_CPP_UTIL_EXIT_CODE_H_
 
 namespace blaze_exit_code {
 
@@ -39,4 +39,4 @@ enum ExitCode {
 
 }  // namespace blaze_exit_code
 
-#endif  // DEVTOOLS_BLAZE_MAIN_UTIL_EXIT_CODE_H_
+#endif  // BAZEL_SRC_MAIN_CPP_UTIL_EXIT_CODE_H_
diff --git a/src/main/cpp/util/file.h b/src/main/cpp/util/file.h
index 1087153da3..461b85f576 100644
--- a/src/main/cpp/util/file.h
+++ b/src/main/cpp/util/file.h
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef DEVTOOLS_BLAZE_MAIN_UTIL_FILE_H_
-#define DEVTOOLS_BLAZE_MAIN_UTIL_FILE_H_
+#ifndef BAZEL_SRC_MAIN_CPP_UTIL_FILE_H_
+#define BAZEL_SRC_MAIN_CPP_UTIL_FILE_H_
 
 #include <string>
 
@@ -38,4 +38,4 @@ string Which(const string &executable);
 
 }  // namespace blaze_util
 
-#endif  // DEVTOOLS_BLAZE_MAIN_UTIL_FILE_H_
+#endif  // BAZEL_SRC_MAIN_CPP_UTIL_FILE_H_
diff --git a/src/main/cpp/util/md5.h b/src/main/cpp/util/md5.h
index 9a6fe92e50..a355ce8580 100644
--- a/src/main/cpp/util/md5.h
+++ b/src/main/cpp/util/md5.h
@@ -15,8 +15,8 @@
 //
 // This implementation saves us from linking huge OpenSSL library.
 
-#ifndef DEVTOOLS_BLAZE_MAIN_UTIL_MD5_H_
-#define DEVTOOLS_BLAZE_MAIN_UTIL_MD5_H_
+#ifndef BAZEL_SRC_MAIN_CPP_UTIL_MD5_H_
+#define BAZEL_SRC_MAIN_CPP_UTIL_MD5_H_
 
 #include <string>
 
@@ -65,5 +65,4 @@ class Md5Digest {
 
 }  // namespace blaze_util
 
-
-#endif  // DEVTOOLS_BLAZE_MAIN_UTIL_MD5_H_
+#endif  // BAZEL_SRC_MAIN_CPP_UTIL_MD5_H_
diff --git a/src/main/cpp/util/numbers.h b/src/main/cpp/util/numbers.h
index 3521775c11..67c5b2342a 100644
--- a/src/main/cpp/util/numbers.h
+++ b/src/main/cpp/util/numbers.h
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef DEVTOOLS_BLAZE_MAIN_UTIL_NUMBERS_H_
-#define DEVTOOLS_BLAZE_MAIN_UTIL_NUMBERS_H_
+#ifndef BAZEL_SRC_MAIN_CPP_UTIL_NUMBERS_H_
+#define BAZEL_SRC_MAIN_CPP_UTIL_NUMBERS_H_
 
 #include <string>
 
@@ -26,4 +26,4 @@ int32_t strto32(const char *str, char **endptr, int base);
 
 }  // namespace blaze_util
 
-#endif  // DEVTOOLS_BLAZE_MAIN_UTIL_NUMBERS_H_
+#endif  // BAZEL_SRC_MAIN_CPP_UTIL_NUMBERS_H_
diff --git a/src/main/cpp/util/port.h b/src/main/cpp/util/port.h
index b023771724..b851664542 100644
--- a/src/main/cpp/util/port.h
+++ b/src/main/cpp/util/port.h
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef DEVTOOLS_BLAZE_MAIN_UTIL_PORT_H_
-#define DEVTOOLS_BLAZE_MAIN_UTIL_PORT_H_
+#ifndef BAZEL_SRC_MAIN_CPP_UTIL_PORT_H_
+#define BAZEL_SRC_MAIN_CPP_UTIL_PORT_H_
 
 #include <stddef.h>  // For size_t
 
@@ -110,4 +110,4 @@ char (&ArraySizeHelper(const T (&array)[N]))[N];
 
 #define arraysize(array) (sizeof(ArraySizeHelper(array)))
 
-#endif  // DEVTOOLS_BLAZE_MAIN_UTIL_PORT_H_
+#endif  // BAZEL_SRC_MAIN_CPP_UTIL_PORT_H_
diff --git a/src/main/cpp/util/strings.h b/src/main/cpp/util/strings.h
index b3742eb8cf..0f0dfc1650 100644
--- a/src/main/cpp/util/strings.h
+++ b/src/main/cpp/util/strings.h
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef DEVTOOLS_BLAZE_MAIN_UTIL_STRINGS_H_
-#define DEVTOOLS_BLAZE_MAIN_UTIL_STRINGS_H_
+#ifndef BAZEL_SRC_MAIN_CPP_UTIL_STRINGS_H_
+#define BAZEL_SRC_MAIN_CPP_UTIL_STRINGS_H_
 
 #include <string>
 #include <vector>
@@ -111,4 +111,4 @@ void ToLower(string* str);
 
 }  // namespace blaze_util
 
-#endif  // DEVTOOLS_BLAZE_MAIN_UTIL_STRINGS_H_
+#endif  // BAZEL_SRC_MAIN_CPP_UTIL_STRINGS_H_
diff --git a/src/main/native/unix_jni.h b/src/main/native/unix_jni.h
index cc47853ab0..058e6c3634 100644
--- a/src/main/native/unix_jni.h
+++ b/src/main/native/unix_jni.h
@@ -14,8 +14,8 @@
 //
 // INTERNAL header file for use by C++ code in this package.
 
-#ifndef JAVA_COM_GOOGLE_DEVTOOLS_BUILD_LIB_UNIX_UNIX_JNI_H__
-#define JAVA_COM_GOOGLE_DEVTOOLS_BUILD_LIB_UNIX_UNIX_JNI_H__
+#ifndef BAZEL_SRC_MAIN_NATIVE_UNIX_JNI_H__
+#define BAZEL_SRC_MAIN_NATIVE_UNIX_JNI_H__
 
 #include <jni.h>
 
@@ -70,4 +70,4 @@ ssize_t portable_getxattr(const char *path, const char *name, void *value,
 ssize_t portable_lgetxattr(const char *path, const char *name, void *value,
                            size_t size);
 
-#endif  // JAVA_COM_GOOGLE_DEVTOOLS_BUILD_LIB_UNIX_UNIX_JNI_H__
+#endif  // BAZEL_SRC_MAIN_NATIVE_UNIX_JNI_H__