From c06d0cd2d874cc3eb4f982e4005d2d6e7e160590 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 14 Aug 2014 13:23:47 +0000 Subject: [PATCH] Add #ifndef guards to types in cef_build.h (issue #1336). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1808 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- include/base/cef_build.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/base/cef_build.h b/include/base/cef_build.h index bf35d6a66..e98a56461 100644 --- a/include/base/cef_build.h +++ b/include/base/cef_build.h @@ -136,6 +136,7 @@ // method in the parent class. // Use like: // virtual void foo() OVERRIDE; +#ifndef OVERRIDE #if defined(__clang__) || defined(COMPILER_MSVC) #define OVERRIDE override #elif defined(COMPILER_GCC) && __cplusplus >= 201103 && \ @@ -145,27 +146,32 @@ #else #define OVERRIDE #endif +#endif // OVERRIDE // Annotate a function indicating the caller must examine the return value. // Use like: // int foo() WARN_UNUSED_RESULT; // To explicitly ignore a result, see |ignore_result()| in . +#ifndef WARN_UNUSED_RESULT #if defined(COMPILER_GCC) #define WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #else #define WARN_UNUSED_RESULT #endif +#endif // WARN_UNUSED_RESULT // Annotate a variable indicating it's ok if the variable is not used. // (Typically used to silence a compiler warning when the assignment // is important for some other reason.) // Use like: // int x ALLOW_UNUSED = ...; +#ifndef ALLOW_UNUSED #if defined(COMPILER_GCC) #define ALLOW_UNUSED __attribute__((unused)) #else #define ALLOW_UNUSED #endif +#endif // ALLOW_UNUSED #endif // !BUILDING_CEF_SHARED