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/fx_zlib | |
| 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/fx_zlib')
| -rw-r--r-- | core/src/fxcodec/fx_zlib/zlib_v128/zutil.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/zutil.h b/core/src/fxcodec/fx_zlib/zlib_v128/zutil.h index 582d1b5f3c..e4ec2bdd91 100644 --- a/core/src/fxcodec/fx_zlib/zlib_v128/zutil.h +++ b/core/src/fxcodec/fx_zlib/zlib_v128/zutil.h @@ -207,9 +207,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define zmemcmp _fmemcmp # define zmemzero(dest, len) _fmemset(dest, 0, len) # else -# define zmemcpy FXSYS_memcpy32 -# define zmemcmp FXSYS_memcmp32 -# define zmemzero(dest, len) FXSYS_memset32(dest, 0, len) +# define zmemcpy FXSYS_memcpy +# define zmemcmp FXSYS_memcmp +# define zmemzero(dest, len) FXSYS_memset(dest, 0, len) # endif #else void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); |