diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-26 09:30:41 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-27 03:16:23 +0000 |
commit | 620223167f1d3a89db4a4ce4bce7b33bda8e726f (patch) | |
tree | dc7dc796b31d93a6f2cbda673fb04b74d5a40399 /third_party/libtiff | |
parent | 698aed79d6ad6e8e3a0c7a500c108d69f944b82d (diff) | |
download | pdfium-620223167f1d3a89db4a4ce4bce7b33bda8e726f.tar.xz |
Remove FX_CPU=FX_WIN64 build flag
The FX_WIN64 flag is a FX_OS flag, so comparing against FX_CPU doesn't
make sense. Removed check.
Bug: pdfium:906
Change-Id: I029de8cf89ade590f705556351416f4759bca87a
Reviewed-on: https://pdfium-review.googlesource.com/14812
Commit-Queue: Nicolás Peña Moreno <npm@chromium.org>
Reviewed-by: Nicolás Peña Moreno <npm@chromium.org>
Diffstat (limited to 'third_party/libtiff')
-rw-r--r-- | third_party/libtiff/0027-build-config.patch | 2 | ||||
-rw-r--r-- | third_party/libtiff/tiffconf.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/libtiff/0027-build-config.patch b/third_party/libtiff/0027-build-config.patch index dcd860cb5d..ec1a205574 100644 --- a/third_party/libtiff/0027-build-config.patch +++ b/third_party/libtiff/0027-build-config.patch @@ -18,7 +18,7 @@ index 2a88cb75f..4d2d7c9d9 100644 +/* Sunliang.Liu 20110325. We should config the correct long size for tif + fax4decode optimize in tif_fax3.c -- Linux64 decode issue. + TESTDOC: Bug #23661 - z1.tif. */ -+#if _FX_CPU_ == _FX_WIN64_ || _FX_CPU_ == _FX_X64_ || _FX_CPU_ == _FX_IA64_ ++#if _FX_CPU_ == _FX_X64_ || _FX_CPU_ == _FX_IA64_ /* The size of `unsigned long', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG sizeOfULong +#define SIZEOF_UNSIGNED_LONG 8 diff --git a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h index 4b7cc2d93a..50e458faf4 100644 --- a/third_party/libtiff/tiffconf.h +++ b/third_party/libtiff/tiffconf.h @@ -42,7 +42,7 @@ /* Sunliang.Liu 20110325. We should config the correct long size for tif fax4decode optimize in tif_fax3.c -- Linux64 decode issue. TESTDOC: Bug #23661 - z1.tif. */ -#if _FX_CPU_ == _FX_WIN64_ || _FX_CPU_ == _FX_X64_ || _FX_CPU_ == _FX_IA64_ +#if _FX_CPU_ == _FX_X64_ || _FX_CPU_ == _FX_IA64_ /* The size of `unsigned long', as computed by sizeof. */ #define SIZEOF_UNSIGNED_LONG 8 #else |