diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-01-15 12:06:28 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-01-15 12:06:28 -0800 |
| commit | 45f2a47df2d6505c351ee0586969bf142c93bf6b (patch) | |
| tree | b9242a35195cd779f38c3566490209024afcb1b9 /third_party/zlib_v128 | |
| parent | 2ac8124c572a6024d0200fb095409edc9549d38a (diff) | |
| download | pdfium-45f2a47df2d6505c351ee0586969bf142c93bf6b.tar.xz | |
XFA: Remove ifdefs for _FX_MANAGED_CODE_.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1591563002 .
Diffstat (limited to 'third_party/zlib_v128')
| -rw-r--r-- | third_party/zlib_v128/gzguts.h | 8 | ||||
| -rw-r--r-- | third_party/zlib_v128/zutil.c | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/third_party/zlib_v128/gzguts.h b/third_party/zlib_v128/gzguts.h index a877c0eee3..e2c3b67eed 100644 --- a/third_party/zlib_v128/gzguts.h +++ b/third_party/zlib_v128/gzguts.h @@ -116,17 +116,9 @@ extern void free OF((voidpf ptr)); #endif -#if defined(_FX_MANAGED_CODE_) && defined(__cplusplus) -extern "C" { -#endif - extern void* FXMEM_DefaultAlloc(size_t, int); extern void FXMEM_DefaultFree(void*, int); -#if defined(_FX_MANAGED_CODE_) && defined(__cplusplus) -} -#endif - #define malloc(size) FXMEM_DefaultAlloc(size, 0) #define free(ptr) FXMEM_DefaultFree(ptr, 0) diff --git a/third_party/zlib_v128/zutil.c b/third_party/zlib_v128/zutil.c index 02b945f7d8..5fa007964d 100644 --- a/third_party/zlib_v128/zutil.c +++ b/third_party/zlib_v128/zutil.c @@ -326,17 +326,9 @@ void ZLIB_INTERNAL zcfree (opaque, ptr) #endif /* !Z_SOLO */ #endif /* 0 */ -#if defined(_FX_MANAGED_CODE_) && defined(__cplusplus) -extern "C" { -#endif - extern void* FXMEM_DefaultAlloc(size_t, int); extern void FXMEM_DefaultFree(void*, int); -#if defined(_FX_MANAGED_CODE_) && defined(__cplusplus) -} -#endif - /* XYQ 2007-1-19 */ voidpf zcalloc(voidpf opaque, unsigned items, unsigned size) { |