ref: 7386bde9d2d192c5a59a9a8813c311e83f69e36d
parent: bb2852089174ed0847e6017f8d9cc4052d2948cb
author: James Zern <jzern@google.com>
date: Sun Dec 15 13:26:15 EST 2013
vpx: normalize include guards Change-Id: Iee670353cffa1f9e97976ac507ad9519e5dda7f7
--- a/vpx/internal/vpx_codec_internal.h
+++ b/vpx/internal/vpx_codec_internal.h
@@ -41,8 +41,8 @@
* Once initialized, the instance is manged using other functions from
* the vpx_codec_* family.
*/
-#ifndef VPX_CODEC_INTERNAL_H
-#define VPX_CODEC_INTERNAL_H
+#ifndef VPX_INTERNAL_VPX_CODEC_INTERNAL_H_
+#define VPX_INTERNAL_VPX_CODEC_INTERNAL_H_
#include "../vpx_decoder.h"
#include "../vpx_encoder.h"
#include <stdarg.h>
@@ -531,4 +531,4 @@
const vpx_codec_mmap_t *mmaps,
const mem_req_t *mem_reqs, int nreqs,
vpx_codec_flags_t init_flags);
-#endif
+#endif // VPX_INTERNAL_VPX_CODEC_INTERNAL_H_
--- a/vpx/svc_context.h
+++ b/vpx/svc_context.h
@@ -138,4 +138,4 @@
} // extern "C"
#endif
-#endif /* VPX_SVC_CONTEXT_H_ */
+#endif // VPX_SVC_CONTEXT_H_
--- a/vpx/vp8.h
+++ b/vpx/vp8.h
@@ -27,8 +27,8 @@
/*!\file
* \brief Provides controls common to both the VP8 encoder and decoder.
*/
-#ifndef VP8_H
-#define VP8_H
+#ifndef VPX_VP8_H_
+#define VPX_VP8_H_
#include "./vpx_codec.h"
#include "./vpx_image.h"
@@ -135,4 +135,4 @@
} // extern "C"
#endif
-#endif
+#endif // VPX_VP8_H_
--- a/vpx/vp8cx.h
+++ b/vpx/vp8cx.h
@@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8CX_H
-#define VP8CX_H
+#ifndef VPX_VP8CX_H_
+#define VPX_VP8CX_H_
/*!\defgroup vp8_encoder WebM VP8 Encoder
* \ingroup vp8
@@ -351,4 +351,4 @@
} // extern "C"
#endif
-#endif
+#endif // VPX_VP8CX_H_
--- a/vpx/vp8dx.h
+++ b/vpx/vp8dx.h
@@ -18,8 +18,8 @@
* \brief Provides definitions for using the VP8 algorithm within the vpx Decoder
* interface.
*/
-#ifndef VP8DX_H
-#define VP8DX_H
+#ifndef VPX_VP8DX_H_
+#define VPX_VP8DX_H_
#ifdef __cplusplus
extern "C" {@@ -123,4 +123,4 @@
} // extern "C"
#endif
-#endif
+#endif // VPX_VP8DX_H_
--- a/vpx/vpx_codec.h
+++ b/vpx/vpx_codec.h
@@ -36,8 +36,8 @@
* Once initialized, the instance is manged using other functions from
* the vpx_codec_* family.
*/
-#ifndef VPX_CODEC_H
-#define VPX_CODEC_H
+#ifndef VPX_VPX_CODEC_H_
+#define VPX_VPX_CODEC_H_
#ifdef __cplusplus
extern "C" {@@ -554,5 +554,5 @@
#ifdef __cplusplus
}
#endif
-#endif
+#endif // VPX_VPX_CODEC_H_
--- a/vpx/vpx_decoder.h
+++ b/vpx/vpx_decoder.h
@@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VPX_DECODER_H
-#define VPX_DECODER_H
+#ifndef VPX_VPX_DECODER_H_
+#define VPX_VPX_DECODER_H_
/*!\defgroup decoder Decoder Algorithm Interface
* \ingroup codec
@@ -376,5 +376,5 @@
#ifdef __cplusplus
}
#endif
-#endif
+#endif // VPX_VPX_DECODER_H_
--- a/vpx/vpx_encoder.h
+++ b/vpx/vpx_encoder.h
@@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VPX_ENCODER_H
-#define VPX_ENCODER_H
+#ifndef VPX_VPX_ENCODER_H_
+#define VPX_VPX_ENCODER_H_
/*!\defgroup encoder Encoder Algorithm Interface
* \ingroup codec
@@ -932,5 +932,5 @@
#ifdef __cplusplus
}
#endif
-#endif
+#endif // VPX_VPX_ENCODER_H_
--- a/vpx/vpx_image.h
+++ b/vpx/vpx_image.h
@@ -17,8 +17,8 @@
extern "C" {#endif
-#ifndef VPX_IMAGE_H
-#define VPX_IMAGE_H
+#ifndef VPX_VPX_IMAGE_H_
+#define VPX_VPX_IMAGE_H_
/*!\brief Current ABI version number
*
@@ -240,4 +240,4 @@
#endif
#ifdef __cplusplus
}
-#endif
+#endif // VPX_VPX_IMAGE_H_
--- a/vpx/vpx_integer.h
+++ b/vpx/vpx_integer.h
@@ -9,8 +9,8 @@
*/
-#ifndef VPX_INTEGER_H
-#define VPX_INTEGER_H
+#ifndef VPX_VPX_INTEGER_H_
+#define VPX_VPX_INTEGER_H_
/* get ptrdiff_t, size_t, wchar_t, NULL */
#include <stddef.h>
@@ -54,4 +54,4 @@
#include <inttypes.h>
#endif
-#endif
+#endif // VPX_VPX_INTEGER_H_