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

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 294
+Version: 295
 License: BSD
 License File: LICENSE
 

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

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 <stddef.h>  // for NULL, size_t
@@ -70,4 +70,4 @@ typedef signed char int8;
   (reinterpret_cast<uint8*>(((reinterpret_cast<uintptr_t>(p) + \
   ((t)-1)) & ~((t)-1))))
 
-#endif  // INCLUDE_LIBYUV_BASIC_TYPES_H_
+#endif  // INCLUDE_LIBYUV_BASIC_TYPES_H_  NOLINT

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

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

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

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

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

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

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

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

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

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

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

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

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