From f37f9a3542799ed17cc5c1c03f94a7ef279cfc20 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Wed, 27 Jun 2012 23:40:23 +0000 Subject: [PATCH] Avoid lint warnings on header guards. BUG=none TEST=none Review URL: https://webrtc-codereview.appspot.com/668006 git-svn-id: http://libyuv.googlecode.com/svn/trunk@295 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv.h | 4 ++-- include/libyuv/basic_types.h | 4 ++-- include/libyuv/compare.h | 4 ++-- include/libyuv/convert.h | 4 ++-- include/libyuv/convert_from.h | 4 ++-- include/libyuv/cpu_id.h | 5 ++--- include/libyuv/format_conversion.h | 4 ++-- include/libyuv/mjpeg_decoder.h | 4 ++-- include/libyuv/planar_functions.h | 4 ++-- include/libyuv/rotate.h | 4 ++-- include/libyuv/rotate_argb.h | 4 ++-- include/libyuv/scale.h | 4 ++-- include/libyuv/scale_argb.h | 4 ++-- include/libyuv/version.h | 7 +++---- include/libyuv/video_common.h | 4 ++-- libyuv.gyp | 30 +++++++++++++++--------------- 17 files changed, 47 insertions(+), 49 deletions(-) diff --git a/README.chromium b/README.chromium index 117680bd1..32f23eda6 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 294 +Version: 295 License: BSD License File: LICENSE diff --git a/include/libyuv.h b/include/libyuv.h index 1657c255b..5622ed9eb 100644 --- a/include/libyuv.h +++ b/include/libyuv.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_H_ +#ifndef INCLUDE_LIBYUV_H_ // NOLINT #define INCLUDE_LIBYUV_H_ #include "libyuv/basic_types.h" @@ -25,4 +25,4 @@ #include "libyuv/version.h" #include "libyuv/video_common.h" -#endif // INCLUDE_LIBYUV_H_ +#endif // INCLUDE_LIBYUV_H_ NOLINT diff --git a/include/libyuv/basic_types.h b/include/libyuv/basic_types.h index 8c312b913..133642406 100644 --- a/include/libyuv/basic_types.h +++ b/include/libyuv/basic_types.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_BASIC_TYPES_H_ +#ifndef INCLUDE_LIBYUV_BASIC_TYPES_H_ // NOLINT #define INCLUDE_LIBYUV_BASIC_TYPES_H_ #include // for NULL, size_t @@ -70,4 +70,4 @@ typedef signed char int8; (reinterpret_cast(((reinterpret_cast(p) + \ ((t)-1)) & ~((t)-1)))) -#endif // INCLUDE_LIBYUV_BASIC_TYPES_H_ +#endif // INCLUDE_LIBYUV_BASIC_TYPES_H_ NOLINT diff --git a/include/libyuv/compare.h b/include/libyuv/compare.h index 1f78d2a9c..73723be6a 100644 --- a/include/libyuv/compare.h +++ b/include/libyuv/compare.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_COMPARE_H_ +#ifndef INCLUDE_LIBYUV_COMPARE_H_ // NOLINT #define INCLUDE_LIBYUV_COMPARE_H_ #include "libyuv/basic_types.h" @@ -62,4 +62,4 @@ double I420Ssim(const uint8* src_y_a, int stride_y_a, } // namespace libyuv #endif -#endif // INCLUDE_LIBYUV_COMPARE_H_ +#endif // INCLUDE_LIBYUV_COMPARE_H_ NOLINT diff --git a/include/libyuv/convert.h b/include/libyuv/convert.h index 56b772d8f..fda151597 100644 --- a/include/libyuv/convert.h +++ b/include/libyuv/convert.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_CONVERT_H_ +#ifndef INCLUDE_LIBYUV_CONVERT_H_ // NOLINT #define INCLUDE_LIBYUV_CONVERT_H_ #include "libyuv/basic_types.h" @@ -218,4 +218,4 @@ int ConvertToI420(const uint8* src_frame, size_t src_size, } // namespace libyuv #endif -#endif // INCLUDE_LIBYUV_CONVERT_H_ +#endif // INCLUDE_LIBYUV_CONVERT_H_ NOLINT diff --git a/include/libyuv/convert_from.h b/include/libyuv/convert_from.h index 34a1571ff..afb8d07d7 100644 --- a/include/libyuv/convert_from.h +++ b/include/libyuv/convert_from.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_CONVERT_FROM_H_ +#ifndef INCLUDE_LIBYUV_CONVERT_FROM_H_ // NOLINT #define INCLUDE_LIBYUV_CONVERT_FROM_H_ #include "libyuv/basic_types.h" @@ -139,4 +139,4 @@ int ConvertFromI420(const uint8* y, int y_stride, } // namespace libyuv #endif -#endif // INCLUDE_LIBYUV_CONVERT_FROM_H_ +#endif // INCLUDE_LIBYUV_CONVERT_FROM_H_ NOLINT diff --git a/include/libyuv/cpu_id.h b/include/libyuv/cpu_id.h index 5638b29f8..75e37a23b 100644 --- a/include/libyuv/cpu_id.h +++ b/include/libyuv/cpu_id.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_CPU_ID_H_ +#ifndef INCLUDE_LIBYUV_CPU_ID_H_ // NOLINT #define INCLUDE_LIBYUV_CPU_ID_H_ #ifdef __cplusplus @@ -56,5 +56,4 @@ void CpuId(int cpu_info[4], int info_type); } // namespace libyuv #endif -#endif // INCLUDE_LIBYUV_CPU_ID_H_ - +#endif // INCLUDE_LIBYUV_CPU_ID_H_ NOLINT diff --git a/include/libyuv/format_conversion.h b/include/libyuv/format_conversion.h index 44e0f67fe..e221d2b77 100644 --- a/include/libyuv/format_conversion.h +++ b/include/libyuv/format_conversion.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_FORMATCONVERSION_H_ +#ifndef INCLUDE_LIBYUV_FORMATCONVERSION_H_ // NOLINT #define INCLUDE_LIBYUV_FORMATCONVERSION_H_ #include "libyuv/basic_types.h" @@ -145,4 +145,4 @@ int ARGBToBayer(const uint8* src_argb, int src_stride_argb, } // namespace libyuv #endif -#endif // INCLUDE_LIBYUV_FORMATCONVERSION_H_ +#endif // INCLUDE_LIBYUV_FORMATCONVERSION_H_ NOLINT diff --git a/include/libyuv/mjpeg_decoder.h b/include/libyuv/mjpeg_decoder.h index a48f4656f..97a48946d 100644 --- a/include/libyuv/mjpeg_decoder.h +++ b/include/libyuv/mjpeg_decoder.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_MJPEG_DECODER_H_ +#ifndef INCLUDE_LIBYUV_MJPEG_DECODER_H_ // NOLINT #define INCLUDE_LIBYUV_MJPEG_DECODER_H_ #include "libyuv/basic_types.h" @@ -183,4 +183,4 @@ class MJpegDecoder { } // namespace libyuv -#endif // INCLUDE_LIBYUV_MJPEG_DECODER_H_ +#endif // INCLUDE_LIBYUV_MJPEG_DECODER_H_ NOLINT diff --git a/include/libyuv/planar_functions.h b/include/libyuv/planar_functions.h index d902be172..968bce000 100644 --- a/include/libyuv/planar_functions.h +++ b/include/libyuv/planar_functions.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_ +#ifndef INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_ // NOLINT #define INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_ #include "libyuv/basic_types.h" @@ -309,4 +309,4 @@ int ARGBBlur(const uint8* src_argb, int src_stride_argb, } // namespace libyuv #endif -#endif // INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_ +#endif // INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_ NOLINT diff --git a/include/libyuv/rotate.h b/include/libyuv/rotate.h index 3a8c42dc0..3ec09de55 100644 --- a/include/libyuv/rotate.h +++ b/include/libyuv/rotate.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_ROTATE_H_ +#ifndef INCLUDE_LIBYUV_ROTATE_H_ // NOLINT #define INCLUDE_LIBYUV_ROTATE_H_ #include "libyuv/basic_types.h" @@ -53,4 +53,4 @@ int NV12ToI420Rotate(const uint8* src_y, int src_stride_y, } // namespace libyuv #endif -#endif // INCLUDE_LIBYUV_ROTATE_H_ +#endif // INCLUDE_LIBYUV_ROTATE_H_ NOLINT diff --git a/include/libyuv/rotate_argb.h b/include/libyuv/rotate_argb.h index 8d6d759b3..0e20bd5d1 100644 --- a/include/libyuv/rotate_argb.h +++ b/include/libyuv/rotate_argb.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_ROTATE_ARGB_H_ +#ifndef INCLUDE_LIBYUV_ROTATE_ARGB_H_ // NOLINT #define INCLUDE_LIBYUV_ROTATE_ARGB_H_ #include "libyuv/basic_types.h" @@ -29,4 +29,4 @@ int ARGBRotate(const uint8* src_argb, int src_stride_argb, } // namespace libyuv #endif -#endif // INCLUDE_LIBYUV_ROTATE_ARGB_H_ +#endif // INCLUDE_LIBYUV_ROTATE_ARGB_H_ NOLINT diff --git a/include/libyuv/scale.h b/include/libyuv/scale.h index be7da448a..520c4af21 100644 --- a/include/libyuv/scale.h +++ b/include/libyuv/scale.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_SCALE_H_ +#ifndef INCLUDE_LIBYUV_SCALE_H_ // NOLINT #define INCLUDE_LIBYUV_SCALE_H_ #include "libyuv/basic_types.h" @@ -74,4 +74,4 @@ void SetUseReferenceImpl(bool use); } // namespace libyuv #endif -#endif // INCLUDE_LIBYUV_SCALE_H_ +#endif // INCLUDE_LIBYUV_SCALE_H_ NOLINT diff --git a/include/libyuv/scale_argb.h b/include/libyuv/scale_argb.h index 958ac96a3..df6533a09 100644 --- a/include/libyuv/scale_argb.h +++ b/include/libyuv/scale_argb.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_SCALE_ARGB_H_ +#ifndef INCLUDE_LIBYUV_SCALE_ARGB_H_ // NOLINT #define INCLUDE_LIBYUV_SCALE_ARGB_H_ #include "libyuv/basic_types.h" @@ -30,4 +30,4 @@ int ARGBScale(const uint8* src_argb, int src_stride_argb, } // namespace libyuv #endif -#endif // INCLUDE_LIBYUV_SCALE_ARGB_H_ +#endif // INCLUDE_LIBYUV_SCALE_ARGB_H_ NOLINT diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 19e04a3b0..95ebab17a 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -8,10 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef INCLUDE_LIBYUV_VERSION_H_ +#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 294 - -#endif // INCLUDE_LIBYUV_VERSION_H_ +#define LIBYUV_VERSION 295 +#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/include/libyuv/video_common.h b/include/libyuv/video_common.h index c1ed67d10..88affb67d 100644 --- a/include/libyuv/video_common.h +++ b/include/libyuv/video_common.h @@ -10,7 +10,7 @@ // Common definitions for video, including fourcc and VideoFormat -#ifndef INCLUDE_LIBYUV_VIDEO_COMMON_H_ +#ifndef INCLUDE_LIBYUV_VIDEO_COMMON_H_ // NOLINT #define INCLUDE_LIBYUV_VIDEO_COMMON_H_ #include "libyuv/basic_types.h" @@ -98,4 +98,4 @@ uint32 CanonicalFourCC(uint32 fourcc); } // namespace libyuv #endif -#endif // INCLUDE_LIBYUV_VIDEO_COMMON_H_ +#endif // INCLUDE_LIBYUV_VIDEO_COMMON_H_ NOLINT diff --git a/libyuv.gyp b/libyuv.gyp index ae556030b..47d457fcb 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -29,21 +29,21 @@ }, 'sources': [ # includes. - 'include/libyuv.h', - 'include/libyuv/basic_types.h', - 'include/libyuv/compare.h', - 'include/libyuv/convert.h', - 'include/libyuv/convert_from.h', - 'include/libyuv/cpu_id.h', - 'include/libyuv/format_conversion.h', - 'include/libyuv/mjpeg_decoder.h', - 'include/libyuv/planar_functions.h', - 'include/libyuv/rotate.h', - 'include/libyuv/rotate_argb.h', - 'include/libyuv/scale.h', - 'include/libyuv/scale_argb.h', - 'include/libyuv/version.h', - 'include/libyuv/video_common.h', + 'include/libyuv.h', + 'include/libyuv/basic_types.h', + 'include/libyuv/compare.h', + 'include/libyuv/convert.h', + 'include/libyuv/convert_from.h', + 'include/libyuv/cpu_id.h', + 'include/libyuv/format_conversion.h', + 'include/libyuv/mjpeg_decoder.h', + 'include/libyuv/planar_functions.h', + 'include/libyuv/rotate.h', + 'include/libyuv/rotate_argb.h', + 'include/libyuv/scale.h', + 'include/libyuv/scale_argb.h', + 'include/libyuv/version.h', + 'include/libyuv/video_common.h', # private includes. 'source/rotate_priv.h',