ref: 941e0b61505699411ca205aaf65841582ac976ef
parent: 7386bde9d2d192c5a59a9a8813c311e83f69e36d
author: James Zern <jzern@google.com>
date: Sun Dec 15 13:32:02 EST 2013
vpx_mem: normalize include guards Change-Id: Iac433b5823c572cfa79e5b6b839cd40b49c0389c
--- a/vpx_mem/include/vpx_mem_intrnl.h
+++ b/vpx_mem/include/vpx_mem_intrnl.h
@@ -9,8 +9,8 @@
*/
-#ifndef __VPX_MEM_INTRNL_H__
-#define __VPX_MEM_INTRNL_H__
+#ifndef VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_
+#define VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_
#include "./vpx_config.h"
#ifndef CONFIG_MEM_MANAGER
@@ -92,4 +92,4 @@
/*returns an addr aligned to the byte boundary specified by align*/
#define align_addr(addr,align) (void*)(((size_t)(addr) + ((align) - 1)) & (size_t)-(align))
-#endif /*__VPX_MEM_INTRNL_H__*/
+#endif // VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_
--- a/vpx_mem/include/vpx_mem_tracker.h
+++ b/vpx_mem/include/vpx_mem_tracker.h
@@ -9,8 +9,8 @@
*/
-#ifndef __VPX_MEM_TRACKER_H__
-#define __VPX_MEM_TRACKER_H__
+#ifndef VPX_MEM_INCLUDE_VPX_MEM_TRACKER_H_
+#define VPX_MEM_INCLUDE_VPX_MEM_TRACKER_H_
/* vpx_mem_tracker version info */
#define vpx_mem_tracker_version "2.5.1.1"
@@ -176,4 +176,4 @@
}
#endif
-#endif // __VPX_MEM_TRACKER_H__
+#endif // VPX_MEM_INCLUDE_VPX_MEM_TRACKER_H_
--- a/vpx_mem/memory_manager/include/cavl_if.h
+++ b/vpx_mem/memory_manager/include/cavl_if.h
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#ifndef VPX_MEM_MEMORY_MANAGER_INCLUDE_CAVL_IF_H_
+#define VPX_MEM_MEMORY_MANAGER_INCLUDE_CAVL_IF_H_
/* Abstract AVL Tree Generic C Package.
** Interface generation header file.
@@ -222,3 +224,5 @@
#undef L_SC
#undef L_LONG_BIT
#undef L_BIT_ARR_DEFN
+
+#endif // VPX_MEM_MEMORY_MANAGER_INCLUDE_CAVL_IF_H_
--- a/vpx_mem/memory_manager/include/cavl_impl.h
+++ b/vpx_mem/memory_manager/include/cavl_impl.h
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#ifndef VPX_MEM_MEMORY_MANAGER_INCLUDE_CAVL_IMPL_H_
+#define VPX_MEM_MEMORY_MANAGER_INCLUDE_CAVL_IMPL_H_
/* Abstract AVL Tree Generic C Package.
** Implementation generation header file.
@@ -1146,3 +1148,5 @@
#undef L_SC
#undef L_BALANCE_PARAM_CALL_PREFIX
#undef L_BALANCE_PARAM_DECL_PREFIX
+
+#endif // VPX_MEM_MEMORY_MANAGER_INCLUDE_CAVL_IMPL_H_
--- a/vpx_mem/memory_manager/include/heapmm.h
+++ b/vpx_mem/memory_manager/include/heapmm.h
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#ifndef VPX_MEM_MEMORY_MANAGER_INCLUDE_HEAPMM_H_
+#define VPX_MEM_MEMORY_MANAGER_INCLUDE_HEAPMM_H_
/* This code is in the public domain.
** Version: 1.1 Author: Walt Karas
@@ -150,3 +152,4 @@
HMM_UNIQUE(size_bau) num_block_align_units);
#endif /* defined HMM_PROCESS */
+#endif // VPX_MEM_MEMORY_MANAGER_INCLUDE_HEAPMM_H_
--- a/vpx_mem/memory_manager/include/hmm_cnfg.h
+++ b/vpx_mem/memory_manager/include/hmm_cnfg.h
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#ifndef VPX_MEM_MEMORY_MANAGER_INCLUDE_HMM_CNFG_H_
+#define VPX_MEM_MEMORY_MANAGER_INCLUDE_HMM_CNFG_H_
/* This code is in the public domain.
** Version: 1.1 Author: Walt Karas
@@ -114,3 +116,5 @@
/* Put configuration 5 definitions here. */
#endif
+
+#endif // VPX_MEM_MEMORY_MANAGER_INCLUDE_HMM_CNFG_H_
--- a/vpx_mem/memory_manager/include/hmm_intrnl.h
+++ b/vpx_mem/memory_manager/include/hmm_intrnl.h
@@ -13,8 +13,8 @@
** Version: 1.1 Author: Walt Karas
*/
-#ifndef HMM_INTRNL_H_
-#define HMM_INTRNL_H_
+#ifndef VPX_MEM_MEMORY_MANAGER_INCLUDE_HMM_INTRNL_H_
+#define VPX_MEM_MEMORY_MANAGER_INCLUDE_HMM_INTRNL_H_
#ifdef __uClinux__
# include <lddk.h>
@@ -156,4 +156,4 @@
#include "cavl_if.h"
-#endif /* Include once. */
+#endif // VPX_MEM_MEMORY_MANAGER_INCLUDE_HMM_INTRNL_H_
--- a/vpx_mem/vpx_mem.h
+++ b/vpx_mem/vpx_mem.h
@@ -9,8 +9,8 @@
*/
-#ifndef __VPX_MEM_H__
-#define __VPX_MEM_H__
+#ifndef VPX_MEM_VPX_MEM_H_
+#define VPX_MEM_VPX_MEM_H_
#include "vpx_config.h"
#if defined(__uClinux__)
@@ -170,4 +170,4 @@
}
#endif
-#endif /* __VPX_MEM_H__ */
+#endif // VPX_MEM_VPX_MEM_H_