diff options
author | John Abd-El-Malek <jam@chromium.org> | 2014-05-20 14:34:30 -0700 |
---|---|---|
committer | John Abd-El-Malek <jam@chromium.org> | 2014-05-20 14:34:30 -0700 |
commit | 4db62f5d942a3a7be00bfb5711836ce9e2c89f4b (patch) | |
tree | 7b48dc24263826cffb45cccc889939e0621e90d6 /core/src/fxcodec | |
parent | 2c4b0465c1b95016a75a5fa10abe0ebb73170ee6 (diff) | |
download | pdfium-4db62f5d942a3a7be00bfb5711836ce9e2c89f4b.tar.xz |
Fixed or silenced all warnings and turned on warnings-as-errors.
- Silence -Wheader-hygiene warning on Clang. Between fx_agg_driver.cpp
and fxjs_v8.h there are hundreds or thousands of things that depend on
"using namespace", so it is best to just suppress this warning than
fix it.
- gzguts.h: Include unistd.h on all non-Windows platforms, not just
Apple platforms. Fixes implicit include warnings on Linux.
- Added parens to silence a warning about mixing && and ||.
- Removed a check if an enum is negative. Enums can be unsigned,
generating an always-false warning. The check isn't necessary.
- Removed some statements that are just names of variables that do
nothing.
BUG=375114
Patch by Matt Giuca <mgiuca@chromium.org>
Diffstat (limited to 'core/src/fxcodec')
-rw-r--r-- | core/src/fxcodec/fx_zlib/zlib_v128/gzguts.h | 6 | ||||
-rw-r--r-- | core/src/fxcodec/lcms2/lcms2-2.6/src/cmsplugin.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/gzguts.h b/core/src/fxcodec/fx_zlib/zlib_v128/gzguts.h index e4454aa65d..a877c0eee3 100644 --- a/core/src/fxcodec/fx_zlib/zlib_v128/gzguts.h +++ b/core/src/fxcodec/fx_zlib/zlib_v128/gzguts.h @@ -29,10 +29,8 @@ #ifdef _WIN32 # include <stddef.h> -#endif - -#ifdef __APPLE__ -#include <unistd.h> +#else +# include <unistd.h> #endif #if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32) diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsplugin.c b/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsplugin.c index 55928b7018..8903d2bd61 100644 --- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsplugin.c +++ b/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsplugin.c @@ -689,7 +689,7 @@ void* _cmsContextGetClientChunk(cmsContext ContextID, _cmsMemoryClient mc) struct _cmsContext_struct* ctx; void *ptr; - if (mc < 0 || mc >= MemoryClientMax) { + if (mc >= MemoryClientMax) { cmsSignalError(ContextID, cmsERROR_RANGE, "Bad context client"); return NULL; } |