Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Side by Side Diff: source/libvpx/vpx_mem/vpx_mem.h

Issue 11974002: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/libvpx/vpx_mem/include/vpx_mem_intrnl.h ('k') | source/libvpx/vpx_mem/vpx_mem_tracker.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 , g_free_func g_free_l 94 , g_free_func g_free_l
95 , g_memcpy_func g_memcpy_l 95 , g_memcpy_func g_memcpy_l
96 , g_memset_func g_memset_l 96 , g_memset_func g_memset_l
97 , g_memmove_func g_memmove_l); 97 , g_memmove_func g_memmove_l);
98 int vpx_mem_unset_functions(void); 98 int vpx_mem_unset_functions(void);
99 99
100 100
101 /* some defines for backward compatibility */ 101 /* some defines for backward compatibility */
102 #define DMEM_GENERAL 0 102 #define DMEM_GENERAL 0
103 103
104 #define duck_memalign(X,Y,Z) vpx_memalign(X,Y) 104 // (*)<
105 #define duck_malloc(X,Y) vpx_malloc(X)
106 #define duck_calloc(X,Y,Z) vpx_calloc(X,Y)
107 #define duck_realloc vpx_realloc
108 #define duck_free vpx_free
109 #define duck_memcpy vpx_memcpy
110 #define duck_memmove vpx_memmove
111 #define duck_memset vpx_memset
112 105
113 #if REPLACE_BUILTIN_FUNCTIONS 106 #if REPLACE_BUILTIN_FUNCTIONS
114 # ifndef __VPX_MEM_C__ 107 # ifndef __VPX_MEM_C__
115 # define memalign vpx_memalign 108 # define memalign vpx_memalign
116 # define malloc vpx_malloc 109 # define malloc vpx_malloc
117 # define calloc vpx_calloc 110 # define calloc vpx_calloc
118 # define realloc vpx_realloc 111 # define realloc vpx_realloc
119 # define free vpx_free 112 # define free vpx_free
120 # define memcpy vpx_memcpy 113 # define memcpy vpx_memcpy
121 # define memmove vpx_memmove 114 # define memmove vpx_memmove
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 164
172 #ifdef VPX_MEM_PLTFRM 165 #ifdef VPX_MEM_PLTFRM
173 # include VPX_MEM_PLTFRM 166 # include VPX_MEM_PLTFRM
174 #endif 167 #endif
175 168
176 #if defined(__cplusplus) 169 #if defined(__cplusplus)
177 } 170 }
178 #endif 171 #endif
179 172
180 #endif /* __VPX_MEM_H__ */ 173 #endif /* __VPX_MEM_H__ */
OLDNEW
« no previous file with comments | « source/libvpx/vpx_mem/include/vpx_mem_intrnl.h ('k') | source/libvpx/vpx_mem/vpx_mem_tracker.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698