diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-10-19 14:49:02 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-10-19 14:49:02 -0700 |
commit | 81d44cd970875542a0abb29b1838e88994c88299 (patch) | |
tree | 22461015b1847930affc52053315d3501413070c /core/include/thirdparties/libjpeg/jconfig.h | |
parent | a5b47041066011eb590a020bb38035442fce48af (diff) | |
download | pdfium-81d44cd970875542a0abb29b1838e88994c88299.tar.xz |
Merge to XFA: Remove duplicate core/include/thirdparties headers.
Review URL: https://codereview.chromium.org/1417483004 .
(cherry picked from commit ad0f4d9b371c1862a78046c2e3dea5d515043070)
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1418543003 .
Diffstat (limited to 'core/include/thirdparties/libjpeg/jconfig.h')
-rw-r--r-- | core/include/thirdparties/libjpeg/jconfig.h | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/core/include/thirdparties/libjpeg/jconfig.h b/core/include/thirdparties/libjpeg/jconfig.h deleted file mode 100644 index ea3c397799..0000000000 --- a/core/include/thirdparties/libjpeg/jconfig.h +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 95 or NT. */ -/* see jconfig.doc for explanations */ - -#define HAVE_PROTOTYPES -#define HAVE_UNSIGNED_CHAR -#define HAVE_UNSIGNED_SHORT -/* #define void char */ -/* #define const */ -#undef CHAR_IS_UNSIGNED -#define HAVE_STDDEF_H -#define HAVE_STDLIB_H -#undef NEED_BSD_STRINGS -#undef NEED_SYS_TYPES_H -#undef NEED_FAR_POINTERS /* we presume a 32-bit flat memory model */ -#undef NEED_SHORT_EXTERNAL_NAMES -#undef INCOMPLETE_TYPES_BROKEN - -/* Define "boolean" as unsigned char, not int, per Windows custom */ -#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ -typedef unsigned char boolean; -#endif -#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ - - -#ifdef JPEG_INTERNALS - -#undef RIGHT_SHIFT_IS_UNSIGNED - -#endif /* JPEG_INTERNALS */ - -#ifdef JPEG_CJPEG_DJPEG - -#define BMP_SUPPORTED /* BMP image file format */ -#define GIF_SUPPORTED /* GIF image file format */ -#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */ -#undef RLE_SUPPORTED /* Utah RLE image file format */ -#define TARGA_SUPPORTED /* Targa image file format */ - -#define TWO_FILE_COMMANDLINE /* optional */ -#define USE_SETMODE /* Microsoft has setmode() */ -#undef NEED_SIGNAL_CATCHER -#undef DONT_USE_B_MODE -#undef PROGRESS_REPORT /* optional */ - -#endif /* JPEG_CJPEG_DJPEG */ |