diff --git a/base/include/android-base/errors.h b/base/include/android-base/errors.h index ca621fa8b7490807ba700837e963e97760b0448e..04c299c8656e598d313ebef8557a57c783199a25 100644 --- a/base/include/android-base/errors.h +++ b/base/include/android-base/errors.h @@ -27,8 +27,8 @@ // special handling to get the error string. Refer to Microsoft documentation // to determine which error code to check for each function. -#ifndef BASE_ERRORS_H -#define BASE_ERRORS_H +#ifndef ANDROID_BASE_ERRORS_H +#define ANDROID_BASE_ERRORS_H #include <string> @@ -43,4 +43,4 @@ std::string SystemErrorCodeToString(int error_code); } // namespace base } // namespace android -#endif // BASE_ERRORS_H +#endif // ANDROID_BASE_ERRORS_H diff --git a/base/include/android-base/file.h b/base/include/android-base/file.h index 5342d98786df32f7818fee1c74a206ad10d53e09..aa18ea7967ba75db88cdfb4735e70e4fba34a194 100644 --- a/base/include/android-base/file.h +++ b/base/include/android-base/file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_FILE_H -#define BASE_FILE_H +#ifndef ANDROID_BASE_FILE_H +#define ANDROID_BASE_FILE_H #include <sys/stat.h> #include <string> @@ -46,4 +46,4 @@ bool RemoveFileIfExists(const std::string& path, std::string* err = nullptr); } // namespace base } // namespace android -#endif // BASE_FILE_H +#endif // ANDROID_BASE_FILE_H diff --git a/base/include/android-base/logging.h b/base/include/android-base/logging.h index 41fe4b32b0dd752e0e4de483873fbe5410fc9d90..b86c232eb0455e47b8c5c6f716bb629840a67b95 100644 --- a/base/include/android-base/logging.h +++ b/base/include/android-base/logging.h @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef BASE_LOGGING_H -#define BASE_LOGGING_H + +#ifndef ANDROID_BASE_LOGGING_H +#define ANDROID_BASE_LOGGING_H // NOTE: For Windows, you must include logging.h after windows.h to allow the // following code to suppress the evil ERROR macro: @@ -346,4 +347,4 @@ class ScopedLogSeverity { } // namespace base } // namespace android -#endif // BASE_LOGGING_H +#endif // ANDROID_BASE_LOGGING_H diff --git a/base/include/android-base/macros.h b/base/include/android-base/macros.h index b1ce7c6baec2afdb7f88233b9d6c5435a61ba5bd..913a9a03e8d198146f37bd3350c6bd1617308c01 100644 --- a/base/include/android-base/macros.h +++ b/base/include/android-base/macros.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef UTILS_MACROS_H -#define UTILS_MACROS_H +#ifndef ANDROID_BASE_MACROS_H +#define ANDROID_BASE_MACROS_H #include <stddef.h> // for size_t #include <unistd.h> // for TEMP_FAILURE_RETRY @@ -185,4 +185,4 @@ void UNUSED(const T&...) { } while (0) #endif -#endif // UTILS_MACROS_H +#endif // ANDROID_BASE_MACROS_H diff --git a/base/include/android-base/memory.h b/base/include/android-base/memory.h index 882582f897c81344de806ce12ecc59281063fd0e..3a2f8fad6bd919d33b3cc8a68d8d909df347290b 100644 --- a/base/include/android-base/memory.h +++ b/base/include/android-base/memory.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_MEMORY_H -#define BASE_MEMORY_H +#ifndef ANDROID_BASE_MEMORY_H +#define ANDROID_BASE_MEMORY_H namespace android { namespace base { @@ -44,4 +44,4 @@ static inline void put_unaligned(T* address, T v) { } // namespace base } // namespace android -#endif // BASE_MEMORY_H +#endif // ANDROID_BASE_MEMORY_H diff --git a/base/include/android-base/parseint.h b/base/include/android-base/parseint.h index 0543795e1d4d5f39cf4b1a0508e1cdce6dc9af4d..ed75e2d48786654942e6db418fc142bf748640f0 100644 --- a/base/include/android-base/parseint.h +++ b/base/include/android-base/parseint.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_PARSEINT_H -#define BASE_PARSEINT_H +#ifndef ANDROID_BASE_PARSEINT_H +#define ANDROID_BASE_PARSEINT_H #include <errno.h> #include <stdlib.h> @@ -70,4 +70,4 @@ bool ParseInt(const char* s, T* out, } // namespace base } // namespace android -#endif // BASE_PARSEINT_H +#endif // ANDROID_BASE_PARSEINT_H diff --git a/base/include/android-base/parsenetaddress.h b/base/include/android-base/parsenetaddress.h index 2de5ac93df27e9e23aaa1e5eb340194cae58cf37..b4ac0256ba0ed6318b4203c59c42e8d6973dfe13 100644 --- a/base/include/android-base/parsenetaddress.h +++ b/base/include/android-base/parsenetaddress.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_PARSENETADDRESS_H -#define BASE_PARSENETADDRESS_H +#ifndef ANDROID_BASE_PARSENETADDRESS_H +#define ANDROID_BASE_PARSENETADDRESS_H #include <string> @@ -35,4 +35,4 @@ bool ParseNetAddress(const std::string& address, std::string* host, int* port, } // namespace base } // namespace android -#endif // BASE_PARSENETADDRESS_H +#endif // ANDROID_BASE_PARSENETADDRESS_H diff --git a/base/include/android-base/stringprintf.h b/base/include/android-base/stringprintf.h index d68af8713e46cf287af11037ac927214da2eec9e..cf666abe0f5d11cf3d0bddc319ca1f2882b2dcb6 100644 --- a/base/include/android-base/stringprintf.h +++ b/base/include/android-base/stringprintf.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_STRINGPRINTF_H -#define BASE_STRINGPRINTF_H +#ifndef ANDROID_BASE_STRINGPRINTF_H +#define ANDROID_BASE_STRINGPRINTF_H #include <stdarg.h> #include <string> @@ -53,4 +53,4 @@ void StringAppendV(std::string* dst, const char* format, va_list ap) } // namespace base } // namespace android -#endif // BASE_STRINGPRINTF_H +#endif // ANDROID_BASE_STRINGPRINTF_H diff --git a/base/include/android-base/strings.h b/base/include/android-base/strings.h index 20da144a40910997dc634d12e29e36c709207467..69781cd40c569ed5c3eb95594c1f534faab7bec5 100644 --- a/base/include/android-base/strings.h +++ b/base/include/android-base/strings.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_STRINGS_H -#define BASE_STRINGS_H +#ifndef ANDROID_BASE_STRINGS_H +#define ANDROID_BASE_STRINGS_H #include <sstream> #include <string> @@ -65,4 +65,4 @@ bool EndsWith(const std::string& s, const char* suffix); } // namespace base } // namespace android -#endif // BASE_STRINGS_H +#endif // ANDROID_BASE_STRINGS_H diff --git a/base/include/android-base/test_utils.h b/base/include/android-base/test_utils.h index 3f6872c3bd45e8b28ef61ff2cf778ad6a765d5fa..4ea3c8e48f060d6d72b32abf90ae1b8a68394cc0 100644 --- a/base/include/android-base/test_utils.h +++ b/base/include/android-base/test_utils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef TEST_UTILS_H -#define TEST_UTILS_H +#ifndef ANDROID_BASE_TEST_UTILS_H +#define ANDROID_BASE_TEST_UTILS_H #include <string> @@ -48,4 +48,4 @@ class TemporaryDir { DISALLOW_COPY_AND_ASSIGN(TemporaryDir); }; -#endif // TEST_UTILS_H +#endif // ANDROID_BASE_TEST_UTILS_H diff --git a/base/include/android-base/thread_annotations.h b/base/include/android-base/thread_annotations.h index 90979df07dfbd688b8c44449673db4015399d061..24221024ccdbd5e0743466eda6ab6e4b1f985af9 100644 --- a/base/include/android-base/thread_annotations.h +++ b/base/include/android-base/thread_annotations.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef UTILS_THREAD_ANNOTATIONS_H -#define UTILS_THREAD_ANNOTATIONS_H +#ifndef ANDROID_BASE_THREAD_ANNOTATIONS_H +#define ANDROID_BASE_THREAD_ANNOTATIONS_H #if defined(__SUPPORT_TS_ANNOTATION__) || defined(__clang__) #define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x)) @@ -80,4 +80,4 @@ #define NO_THREAD_SAFETY_ANALYSIS \ THREAD_ANNOTATION_ATTRIBUTE__(no_thread_safety_analysis) -#endif // UTILS_THREAD_ANNOTATIONS_H +#endif // ANDROID_BASE_THREAD_ANNOTATIONS_H diff --git a/base/include/android-base/unique_fd.h b/base/include/android-base/unique_fd.h index d3b27cae3981142700b809e689c6b68eb6bcd9f2..f96e6c32fb45d4708d1545dbd65db9873bd3486a 100644 --- a/base/include/android-base/unique_fd.h +++ b/base/include/android-base/unique_fd.h @@ -76,4 +76,4 @@ class unique_fd final { } // namespace base } // namespace android -#endif // ANDROID_BASE_UNIQUE_FD_H +#endif // ANDROID_BASE_UNIQUE_FD_H diff --git a/base/include/android-base/utf8.h b/base/include/android-base/utf8.h index 3b0ed0af83cec37a78fb9ff8ab8547341a6d08ad..2d5a6f6d70841c4b83e00a3982fbdbe4cedea08b 100755 --- a/base/include/android-base/utf8.h +++ b/base/include/android-base/utf8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UTF8_H -#define BASE_UTF8_H +#ifndef ANDROID_BASE_UTF8_H +#define ANDROID_BASE_UTF8_H #ifdef _WIN32 #include <string> @@ -84,4 +84,4 @@ using ::unlink; } // namespace base } // namespace android -#endif // BASE_UTF8_H +#endif // ANDROID_BASE_UTF8_H