Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37613657 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Fix <android-base/*.h> header guards."

parents 19388fc3 54c72aac

base/include/android-base/errors.h

+3 −3
Original line number Diff line number Diff line
@@ -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

base/include/android-base/file.h

+3 −3
Original line number Diff line number Diff line
@@ -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

base/include/android-base/logging.h

+4 −3
Original line number Diff line number Diff line
@@ -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

base/include/android-base/macros.h

+3 −3
Original line number Diff line number Diff line
@@ -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

base/include/android-base/memory.h

+3 −3
Original line number Diff line number Diff line
@@ -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