diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-11 12:17:45 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-11 12:17:45 -0700 |
| commit | 6581175666ba4e1eb2826142376cbfe4495c6e76 (patch) | |
| tree | 38770d7cf709979b0d493a6ca0367a0cbc080736 /core/src/fxcodec/libjpeg | |
| parent | 05f11bcf48a630b53cac603538bb75f21ad4231d (diff) | |
| download | pdfium-6581175666ba4e1eb2826142376cbfe4495c6e76.tar.xz | |
Merge to XFA: Kill FXSYS_mem{cpy,cmp,set.move}{32,8}.
Only manual merge was core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
follwed by scripts.
Original Review URL: https://codereview.chromium.org/1179693003.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1179953002.
Diffstat (limited to 'core/src/fxcodec/libjpeg')
| -rw-r--r-- | core/src/fxcodec/libjpeg/jinclude.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxcodec/libjpeg/jinclude.h b/core/src/fxcodec/libjpeg/jinclude.h index 0c7aa68360..5cfc6e1fc9 100644 --- a/core/src/fxcodec/libjpeg/jinclude.h +++ b/core/src/fxcodec/libjpeg/jinclude.h @@ -75,8 +75,8 @@ #else /* not BSD, assume ANSI/SysV string lib */ //#include <string.h> -#define MEMZERO(target,size) FXSYS_memset32((void *)(target), 0, (size_t)(size)) -#define MEMCOPY(dest,src,size) FXSYS_memcpy32((void *)(dest), (const void *)(src), (size_t)(size)) +#define MEMZERO(target,size) FXSYS_memset((void *)(target), 0, (size_t)(size)) +#define MEMCOPY(dest,src,size) FXSYS_memcpy((void *)(dest), (const void *)(src), (size_t)(size)) #endif |