From d2499ead93dc4298c0882fe98902acb1b5209f99 Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 19 Oct 2018 23:05:00 -0500 Subject: Update libaom to commit ID 1e227d41f0616de9548a673a83a21ef990b62591 --- third_party/aom/aom_mem/aom_mem.h | 6 +++--- third_party/aom/aom_mem/include/aom_mem_intrnl.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'third_party/aom/aom_mem') diff --git a/third_party/aom/aom_mem/aom_mem.h b/third_party/aom/aom_mem/aom_mem.h index a36ee3e03..4b1fa45f1 100644 --- a/third_party/aom/aom_mem/aom_mem.h +++ b/third_party/aom/aom_mem/aom_mem.h @@ -9,8 +9,8 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#ifndef AOM_MEM_AOM_MEM_H_ -#define AOM_MEM_AOM_MEM_H_ +#ifndef AOM_AOM_MEM_AOM_MEM_H_ +#define AOM_AOM_MEM_AOM_MEM_H_ #include "aom/aom_integer.h" #include "config/aom_config.h" @@ -67,4 +67,4 @@ void *aom_memset16(void *dest, int val, size_t length); } #endif -#endif // AOM_MEM_AOM_MEM_H_ +#endif // AOM_AOM_MEM_AOM_MEM_H_ diff --git a/third_party/aom/aom_mem/include/aom_mem_intrnl.h b/third_party/aom/aom_mem/include/aom_mem_intrnl.h index 977ebadcd..cbc30a9bb 100644 --- a/third_party/aom/aom_mem/include/aom_mem_intrnl.h +++ b/third_party/aom/aom_mem/include/aom_mem_intrnl.h @@ -9,8 +9,8 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#ifndef AOM_MEM_INCLUDE_AOM_MEM_INTRNL_H_ -#define AOM_MEM_INCLUDE_AOM_MEM_INTRNL_H_ +#ifndef AOM_AOM_MEM_INCLUDE_AOM_MEM_INTRNL_H_ +#define AOM_AOM_MEM_INCLUDE_AOM_MEM_INTRNL_H_ #include "config/aom_config.h" @@ -30,4 +30,4 @@ #define align_addr(addr, align) \ (void *)(((size_t)(addr) + ((align)-1)) & ~(size_t)((align)-1)) -#endif // AOM_MEM_INCLUDE_AOM_MEM_INTRNL_H_ +#endif // AOM_AOM_MEM_INCLUDE_AOM_MEM_INTRNL_H_ -- cgit v1.2.3