Attachment 74121 Details for Bug 60095 – fix compilation on 32-bit machines

[patch] fix compilation on 32-bit machines

0001-Fix-compilation-on-32-bit-machines.patch (text/plain), 27.50 KB, created by Adrian Johnson on 2013-02-03 08:08:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Johnson

Created: 2013-02-03 08:08:24 UTC

Size: 27.50 KB

patch

obsolete

>From 8ac37c748374db0ab3ad577603a4ec6c2c9a2917 Mon Sep 17 00:00:00 2001
>From: Adrian Johnson <ajohnson@redneon.com>
>Date: Sun, 3 Feb 2013 18:33:31 +1030
>Subject: [PATCH 1/2] Fix compilation on 32-bit machines
>
>config.h needs to be the first include in each source file to
>ensure _FILE_OFFSET_BITS is defined before including any
>system header that may define off_t.
>
>Bug 60095
>---
> cpp/PNMWriter.cc                      |    1 +
> cpp/poppler-document.cpp              |    1 +
> cpp/poppler-embedded-file.cpp         |    1 +
> cpp/poppler-font.cpp                  |    1 +
> cpp/poppler-global.cpp                |    1 +
> cpp/poppler-image.cpp                 |    1 +
> cpp/poppler-page-renderer.cpp         |    1 +
> cpp/poppler-page-transition.cpp       |    1 +
> cpp/poppler-page.cpp                  |    1 +
> cpp/poppler-private.cpp               |    1 +
> cpp/poppler-rectangle.cpp             |    1 +
> cpp/poppler-toc.cpp                   |    1 +
> cpp/poppler-version.cpp               |    1 +
> fofi/FoFiIdentifier.cc                |    1 +
> glib/poppler-action.cc                |    1 +
> glib/poppler-date.cc                  |    1 +
> glib/poppler-form-field.cc            |    1 +
> glib/poppler-layer.cc                 |    1 +
> glib/poppler-movie.cc                 |    1 +
> goo/ImgWriter.cc                      |    1 +
> goo/JpegWriter.cc                     |    1 +
> goo/PNGWriter.cc                      |    1 +
> goo/TiffWriter.cc                     |    1 +
> goo/gstrtod.cc                        |    1 +
> poppler/DCTStream.cc                  |    1 +
> poppler/FlateStream.cc                |    3 +++
> poppler/JPEG2000Stream.cc             |    2 +-
> poppler/Linearization.cc              |    1 +
> poppler/Movie.cc                      |    1 +
> poppler/PDFDocEncoding.cc             |    1 +
> poppler/PageTransition.cc             |    1 +
> poppler/PopplerCache.cc               |    1 +
> poppler/Rendition.cc                  |    1 +
> poppler/Sound.cc                      |    1 +
> poppler/UTF.cc                        |    1 +
> poppler/UnicodeTypeTable.cc           |    1 +
> poppler/strtok_r.cpp                  |    2 ++
> qt4/src/poppler-annotation.cc         |    2 ++
> qt4/src/poppler-base-converter.cc     |    1 +
> qt4/src/poppler-document.cc           |    2 +-
> qt4/src/poppler-embeddedfile.cc       |    1 +
> qt4/src/poppler-fontinfo.cc           |    1 +
> qt4/src/poppler-form.cc               |    1 +
> qt4/src/poppler-link-extractor.cc     |    1 +
> qt4/src/poppler-link.cc               |    1 +
> qt4/src/poppler-media.cc              |    2 ++
> qt4/src/poppler-movie.cc              |    1 +
> qt4/src/poppler-optcontent.cc         |    1 +
> qt4/src/poppler-page-transition.cc    |    1 +
> qt4/src/poppler-page.cc               |    1 +
> qt4/src/poppler-pdf-converter.cc      |    1 +
> qt4/src/poppler-private.cc            |    1 +
> qt4/src/poppler-ps-converter.cc       |    1 +
> qt4/src/poppler-qiodeviceoutstream.cc |    1 +
> qt4/src/poppler-sound.cc              |    1 +
> qt4/src/poppler-textbox.cc            |    1 +
> qt4/tests/check_goostring.cpp         |    2 ++
> qt4/tests/check_lexer.cpp             |    2 ++
> qt4/tests/check_optcontent.cpp        |    2 ++
> qt4/tests/check_strings.cpp           |    2 ++
> test/pdf-fullrewrite.cc               |    1 +
> test/perf-test-preview-dummy.cc       |    1 +
> test/perf-test-preview-win.cc         |    1 +
> test/perf-test.cc                     |    3 ++-
> utils/HtmlFonts.cc                    |    1 +
> utils/HtmlLinks.cc                    |    1 +
> utils/parseargs.cc                    |    2 ++
> utils/pdfunite.cc                     |    3 ++-
> utils/printencodings.cc               |    1 +
> 69 files changed, 81 insertions(+), 4 deletions(-)
>
>diff --git a/cpp/PNMWriter.cc b/cpp/PNMWriter.cc
>index a2b9a77..bc38c73 100644
>--- a/cpp/PNMWriter.cc
>+++ b/cpp/PNMWriter.cc
>@@ -8,6 +8,7 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include "PNMWriter.h"
> 
> #include <vector>
>diff --git a/cpp/poppler-document.cpp b/cpp/poppler-document.cpp
>index 1c24b47..5181afd 100644
>--- a/cpp/poppler-document.cpp
>+++ b/cpp/poppler-document.cpp
>@@ -16,6 +16,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-document.h"
> #include "poppler-embedded-file.h"
> #include "poppler-page.h"
>diff --git a/cpp/poppler-embedded-file.cpp b/cpp/poppler-embedded-file.cpp
>index 2c5d077..de41455 100644
>--- a/cpp/poppler-embedded-file.cpp
>+++ b/cpp/poppler-embedded-file.cpp
>@@ -16,6 +16,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-embedded-file.h"
> 
> #include "poppler-embedded-file-private.h"
>diff --git a/cpp/poppler-font.cpp b/cpp/poppler-font.cpp
>index ab3b409..7237b47 100644
>--- a/cpp/poppler-font.cpp
>+++ b/cpp/poppler-font.cpp
>@@ -16,6 +16,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-font.h"
> 
> #include "poppler-document-private.h"
>diff --git a/cpp/poppler-global.cpp b/cpp/poppler-global.cpp
>index 176c0c8..e6ca7e7 100644
>--- a/cpp/poppler-global.cpp
>+++ b/cpp/poppler-global.cpp
>@@ -17,6 +17,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-global.h"
> 
> #include "poppler-private.h"
>diff --git a/cpp/poppler-image.cpp b/cpp/poppler-image.cpp
>index 8e9ac63..283fac8 100644
>--- a/cpp/poppler-image.cpp
>+++ b/cpp/poppler-image.cpp
>@@ -16,6 +16,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-image.h"
> 
> #include "poppler-image-private.h"
>diff --git a/cpp/poppler-page-renderer.cpp b/cpp/poppler-page-renderer.cpp
>index 1317192..c7db6df 100644
>--- a/cpp/poppler-page-renderer.cpp
>+++ b/cpp/poppler-page-renderer.cpp
>@@ -16,6 +16,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-page-renderer.h"
> 
> #include "poppler-document-private.h"
>diff --git a/cpp/poppler-page-transition.cpp b/cpp/poppler-page-transition.cpp
>index 7c83723..75b66fe 100644
>--- a/cpp/poppler-page-transition.cpp
>+++ b/cpp/poppler-page-transition.cpp
>@@ -17,6 +17,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-page-transition.h"
> 
> #include "PageTransition.h"
>diff --git a/cpp/poppler-page.cpp b/cpp/poppler-page.cpp
>index d72a477..36e8126 100644
>--- a/cpp/poppler-page.cpp
>+++ b/cpp/poppler-page.cpp
>@@ -16,6 +16,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-page.h"
> #include "poppler-page-transition.h"
> 
>diff --git a/cpp/poppler-private.cpp b/cpp/poppler-private.cpp
>index 3bee619..88aef6e 100644
>--- a/cpp/poppler-private.cpp
>+++ b/cpp/poppler-private.cpp
>@@ -17,6 +17,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-private.h"
> 
> #include "DateInfo.h"
>diff --git a/cpp/poppler-rectangle.cpp b/cpp/poppler-rectangle.cpp
>index 83e5cc9..bc66e4f 100644
>--- a/cpp/poppler-rectangle.cpp
>+++ b/cpp/poppler-rectangle.cpp
>@@ -16,6 +16,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-rectangle.h"
> 
> #include <iostream>
>diff --git a/cpp/poppler-toc.cpp b/cpp/poppler-toc.cpp
>index a3149c6..5559386 100644
>--- a/cpp/poppler-toc.cpp
>+++ b/cpp/poppler-toc.cpp
>@@ -16,6 +16,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-toc.h"
> 
> #include "poppler-toc-private.h"
>diff --git a/cpp/poppler-version.cpp b/cpp/poppler-version.cpp
>index dcc100f..a3a69a0 100644
>--- a/cpp/poppler-version.cpp
>+++ b/cpp/poppler-version.cpp
>@@ -16,6 +16,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-version.h"
> 
> using namespace poppler;
>diff --git a/fofi/FoFiIdentifier.cc b/fofi/FoFiIdentifier.cc
>index d8ee7e0..1929d18 100644
>--- a/fofi/FoFiIdentifier.cc
>+++ b/fofi/FoFiIdentifier.cc
>@@ -10,6 +10,7 @@
> #pragma implementation
> #endif
> 
>+#include "config.h"
> #include <stdio.h>
> #include <string.h>
> #include <limits.h>
>diff --git a/glib/poppler-action.cc b/glib/poppler-action.cc
>index 384530f..4165b8c 100644
>--- a/glib/poppler-action.cc
>+++ b/glib/poppler-action.cc
>@@ -16,6 +16,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler.h"
> #include "poppler-private.h"
> 
>diff --git a/glib/poppler-date.cc b/glib/poppler-date.cc
>index e3141c1..c6d9d37 100644
>--- a/glib/poppler-date.cc
>+++ b/glib/poppler-date.cc
>@@ -17,6 +17,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include <DateInfo.h>
> 
> #include "poppler-date.h"
>diff --git a/glib/poppler-form-field.cc b/glib/poppler-form-field.cc
>index 5687799..7215a92 100644
>--- a/glib/poppler-form-field.cc
>+++ b/glib/poppler-form-field.cc
>@@ -18,6 +18,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler.h"
> #include "poppler-private.h"
> 
>diff --git a/glib/poppler-layer.cc b/glib/poppler-layer.cc
>index 4c6bf6e..c32b847 100644
>--- a/glib/poppler-layer.cc
>+++ b/glib/poppler-layer.cc
>@@ -17,6 +17,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-layer.h"
> #include "poppler-private.h"
> 
>diff --git a/glib/poppler-movie.cc b/glib/poppler-movie.cc
>index cb5a2ad..dd56e8d 100644
>--- a/glib/poppler-movie.cc
>+++ b/glib/poppler-movie.cc
>@@ -18,6 +18,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-movie.h"
> #include "poppler-private.h"
> 
>diff --git a/goo/ImgWriter.cc b/goo/ImgWriter.cc
>index a30d26d..793ce6d 100644
>--- a/goo/ImgWriter.cc
>+++ b/goo/ImgWriter.cc
>@@ -8,6 +8,7 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include "ImgWriter.h"
> 
> ImgWriter::~ImgWriter()
>diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc
>index 09f9b7b..627bbcf 100644
>--- a/goo/JpegWriter.cc
>+++ b/goo/JpegWriter.cc
>@@ -11,6 +11,7 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include "JpegWriter.h"
> 
> #ifdef ENABLE_LIBJPEG
>diff --git a/goo/PNGWriter.cc b/goo/PNGWriter.cc
>index b775600..debcfe2 100644
>--- a/goo/PNGWriter.cc
>+++ b/goo/PNGWriter.cc
>@@ -14,6 +14,7 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include "PNGWriter.h"
> 
> #ifdef ENABLE_LIBPNG
>diff --git a/goo/TiffWriter.cc b/goo/TiffWriter.cc
>index d372a5b..704ce1e 100644
>--- a/goo/TiffWriter.cc
>+++ b/goo/TiffWriter.cc
>@@ -11,6 +11,7 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include "TiffWriter.h"
> 
> #if ENABLE_LIBTIFF
>diff --git a/goo/gstrtod.cc b/goo/gstrtod.cc
>index cd1d5b5..0bb87e6 100644
>--- a/goo/gstrtod.cc
>+++ b/goo/gstrtod.cc
>@@ -20,6 +20,7 @@
> 
> /* This function comes from spectre-utils from libspectre */
> 
>+#include "config.h"
> #include "gstrtod.h"
> 
> #include <locale.h>
>diff --git a/poppler/DCTStream.cc b/poppler/DCTStream.cc
>index 6302c8b..c21af2f 100644
>--- a/poppler/DCTStream.cc
>+++ b/poppler/DCTStream.cc
>@@ -14,6 +14,7 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include "DCTStream.h"
> 
> static void str_init_source(j_decompress_ptr cinfo)
>diff --git a/poppler/FlateStream.cc b/poppler/FlateStream.cc
>index 7990dad..7984566 100644
>--- a/poppler/FlateStream.cc
>+++ b/poppler/FlateStream.cc
>@@ -8,7 +8,10 @@
> // This file is under the GPLv2 or later license
> //
> //========================================================================
>+
>+#include "config.h"
> #include "FlateStream.h"
>+
> FlateStream::FlateStream(Stream *strA, int predictor, int columns, int colors, int bits) :
>   FilterStream(strA)
> {
>diff --git a/poppler/JPEG2000Stream.cc b/poppler/JPEG2000Stream.cc
>index 703d471..b7af76b 100644
>--- a/poppler/JPEG2000Stream.cc
>+++ b/poppler/JPEG2000Stream.cc
>@@ -12,9 +12,9 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include "JPEG2000Stream.h"
> 
>-#include "config.h"
> 
> JPXStream::JPXStream(Stream *strA) : FilterStream(strA)
> {
>diff --git a/poppler/Linearization.cc b/poppler/Linearization.cc
>index 33331d1..dbbdc55 100644
>--- a/poppler/Linearization.cc
>+++ b/poppler/Linearization.cc
>@@ -8,6 +8,7 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include "Linearization.h"
> #include "Parser.h"
> #include "Lexer.h"
>diff --git a/poppler/Movie.cc b/poppler/Movie.cc
>index f68b6ad..d5bfea3 100644
>--- a/poppler/Movie.cc
>+++ b/poppler/Movie.cc
>@@ -23,6 +23,7 @@
> // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> //*********************************************************************************
> 
>+#include "config.h"
> #include <math.h>
> #include "Movie.h"
> #include "FileSpec.h"
>diff --git a/poppler/PDFDocEncoding.cc b/poppler/PDFDocEncoding.cc
>index 7940834..778d6e8 100644
>--- a/poppler/PDFDocEncoding.cc
>+++ b/poppler/PDFDocEncoding.cc
>@@ -20,6 +20,7 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include "PDFDocEncoding.h"
> 
> // Mapping of PDFDocEncoding (used to represent text values such as document
>diff --git a/poppler/PageTransition.cc b/poppler/PageTransition.cc
>index 441634c..b90a322 100644
>--- a/poppler/PageTransition.cc
>+++ b/poppler/PageTransition.cc
>@@ -22,6 +22,7 @@
> #pragma implementation
> #endif
> 
>+#include "config.h"
> #include "PageTransition.h"
> 
> //------------------------------------------------------------------------
>diff --git a/poppler/PopplerCache.cc b/poppler/PopplerCache.cc
>index 6018a77..bab7bf9 100644
>--- a/poppler/PopplerCache.cc
>+++ b/poppler/PopplerCache.cc
>@@ -10,6 +10,7 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include "PopplerCache.h"
> 
> #include "XRef.h"
>diff --git a/poppler/Rendition.cc b/poppler/Rendition.cc
>index c040bf2..7d9b703 100644
>--- a/poppler/Rendition.cc
>+++ b/poppler/Rendition.cc
>@@ -23,6 +23,7 @@
> // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> //*********************************************************************************
> 
>+#include "config.h"
> #include <math.h>
> #include "Rendition.h"
> #include "FileSpec.h"
>diff --git a/poppler/Sound.cc b/poppler/Sound.cc
>index 6129fdc..94a2e0f 100644
>--- a/poppler/Sound.cc
>+++ b/poppler/Sound.cc
>@@ -17,6 +17,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "GooString.h"
> #include "Object.h"
> #include "Sound.h"
>diff --git a/poppler/UTF.cc b/poppler/UTF.cc
>index 42c7836..ef814de 100644
>--- a/poppler/UTF.cc
>+++ b/poppler/UTF.cc
>@@ -22,6 +22,7 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include "goo/gmem.h"
> #include "PDFDocEncoding.h"
> #include "UTF.h"
>diff --git a/poppler/UnicodeTypeTable.cc b/poppler/UnicodeTypeTable.cc
>index 721af9d..ca6d9bd 100644
>--- a/poppler/UnicodeTypeTable.cc
>+++ b/poppler/UnicodeTypeTable.cc
>@@ -23,6 +23,7 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include <stdlib.h>
> #include "CharTypes.h"
> #include "UnicodeTypeTable.h"
>diff --git a/poppler/strtok_r.cpp b/poppler/strtok_r.cpp
>index 6483e0f..aa0383f 100644
>--- a/poppler/strtok_r.cpp
>+++ b/poppler/strtok_r.cpp
>@@ -55,6 +55,8 @@
> //
> //========================================================================
> 
>+#include "config.h"
>+
> #if defined(__MINGW32__) && !defined(__WINPTHREADS_VERSION)
> #include <string.h>
> 
>diff --git a/qt4/src/poppler-annotation.cc b/qt4/src/poppler-annotation.cc
>index 5ecea80..fce0011 100644
>--- a/qt4/src/poppler-annotation.cc
>+++ b/qt4/src/poppler-annotation.cc
>@@ -22,6 +22,8 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
>+
> // qt/kde includes
> #include <QtCore/QRegExp>
> #include <QtCore/QtAlgorithms>
>diff --git a/qt4/src/poppler-base-converter.cc b/qt4/src/poppler-base-converter.cc
>index 11ff17c..32b6500 100644
>--- a/qt4/src/poppler-base-converter.cc
>+++ b/qt4/src/poppler-base-converter.cc
>@@ -17,6 +17,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-qt4.h"
> 
> #include "poppler-converter-private.h"
>diff --git a/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc
>index 7d13656..c5d2ada 100644
>--- a/qt4/src/poppler-document.cc
>+++ b/qt4/src/poppler-document.cc
>@@ -23,9 +23,9 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-qt4.h"
> 
>-#include <config.h>
> #include <ErrorCodes.h>
> #include <GlobalParams.h>
> #include <Outline.h>
>diff --git a/qt4/src/poppler-embeddedfile.cc b/qt4/src/poppler-embeddedfile.cc
>index 5b3f7d3..6bad584 100644
>--- a/qt4/src/poppler-embeddedfile.cc
>+++ b/qt4/src/poppler-embeddedfile.cc
>@@ -18,6 +18,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-qt4.h"
> 
> #include <QtCore/QString>
>diff --git a/qt4/src/poppler-fontinfo.cc b/qt4/src/poppler-fontinfo.cc
>index 81aed71..0e7e1b4 100644
>--- a/qt4/src/poppler-fontinfo.cc
>+++ b/qt4/src/poppler-fontinfo.cc
>@@ -20,6 +20,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-qt4.h"
> #include "poppler-private.h"
> 
>diff --git a/qt4/src/poppler-form.cc b/qt4/src/poppler-form.cc
>index a5e5adf..af5f337 100644
>--- a/qt4/src/poppler-form.cc
>+++ b/qt4/src/poppler-form.cc
>@@ -19,6 +19,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-qt4.h"
> 
> #include <QtCore/QSizeF>
>diff --git a/qt4/src/poppler-link-extractor.cc b/qt4/src/poppler-link-extractor.cc
>index 0b1563b..8bae2d8 100644
>--- a/qt4/src/poppler-link-extractor.cc
>+++ b/qt4/src/poppler-link-extractor.cc
>@@ -17,6 +17,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-link-extractor-private.h"
> 
> #include <GfxState.h>
>diff --git a/qt4/src/poppler-link.cc b/qt4/src/poppler-link.cc
>index 199e2db..c8cb5e6 100644
>--- a/qt4/src/poppler-link.cc
>+++ b/qt4/src/poppler-link.cc
>@@ -22,6 +22,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include <poppler-qt4.h>
> #include <poppler-private.h>
> #include <poppler-media.h>
>diff --git a/qt4/src/poppler-media.cc b/qt4/src/poppler-media.cc
>index c318147..35c6513 100644
>--- a/qt4/src/poppler-media.cc
>+++ b/qt4/src/poppler-media.cc
>@@ -16,6 +16,8 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
>+
> #include "poppler-media.h"
> 
> #include "Rendition.h"
>diff --git a/qt4/src/poppler-movie.cc b/qt4/src/poppler-movie.cc
>index a64847c..940b580 100644
>--- a/qt4/src/poppler-movie.cc
>+++ b/qt4/src/poppler-movie.cc
>@@ -19,6 +19,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-qt4.h"
> 
> #include "Object.h"
>diff --git a/qt4/src/poppler-optcontent.cc b/qt4/src/poppler-optcontent.cc
>index 6a5ffe7..6a5eeb4 100644
>--- a/qt4/src/poppler-optcontent.cc
>+++ b/qt4/src/poppler-optcontent.cc
>@@ -19,6 +19,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-optcontent.h"
> 
> #include "poppler-optcontent-private.h"
>diff --git a/qt4/src/poppler-page-transition.cc b/qt4/src/poppler-page-transition.cc
>index cde8818..f6209fb 100644
>--- a/qt4/src/poppler-page-transition.cc
>+++ b/qt4/src/poppler-page-transition.cc
>@@ -16,6 +16,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "PageTransition.h"
> #include "poppler-page-transition.h"
> #include "poppler-page-transition-private.h"
>diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc
>index f9ac443..59bea6f 100644
>--- a/qt4/src/poppler-page.cc
>+++ b/qt4/src/poppler-page.cc
>@@ -30,6 +30,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include <poppler-qt4.h>
> 
> #include <QtCore/QHash>
>diff --git a/qt4/src/poppler-pdf-converter.cc b/qt4/src/poppler-pdf-converter.cc
>index 9699b75..d9b565a 100644
>--- a/qt4/src/poppler-pdf-converter.cc
>+++ b/qt4/src/poppler-pdf-converter.cc
>@@ -17,6 +17,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-qt4.h"
> 
> #include "poppler-private.h"
>diff --git a/qt4/src/poppler-private.cc b/qt4/src/poppler-private.cc
>index 308a966..0831c6e 100644
>--- a/qt4/src/poppler-private.cc
>+++ b/qt4/src/poppler-private.cc
>@@ -23,6 +23,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-private.h"
> 
> #include <QtCore/QByteArray>
>diff --git a/qt4/src/poppler-ps-converter.cc b/qt4/src/poppler-ps-converter.cc
>index 63fb7b4..5cb42a4 100644
>--- a/qt4/src/poppler-ps-converter.cc
>+++ b/qt4/src/poppler-ps-converter.cc
>@@ -20,6 +20,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-qt4.h"
> 
> #include "poppler-private.h"
>diff --git a/qt4/src/poppler-qiodeviceoutstream.cc b/qt4/src/poppler-qiodeviceoutstream.cc
>index e3e9f89..3d39115 100644
>--- a/qt4/src/poppler-qiodeviceoutstream.cc
>+++ b/qt4/src/poppler-qiodeviceoutstream.cc
>@@ -17,6 +17,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-qiodeviceoutstream-private.h"
> 
> #include <QtCore/QIODevice>
>diff --git a/qt4/src/poppler-sound.cc b/qt4/src/poppler-sound.cc
>index eb19b9d..877ad98 100644
>--- a/qt4/src/poppler-sound.cc
>+++ b/qt4/src/poppler-sound.cc
>@@ -17,6 +17,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-qt4.h"
> 
> #include "Object.h"
>diff --git a/qt4/src/poppler-textbox.cc b/qt4/src/poppler-textbox.cc
>index 88cf2a9..e8090dd 100644
>--- a/qt4/src/poppler-textbox.cc
>+++ b/qt4/src/poppler-textbox.cc
>@@ -18,6 +18,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "poppler-qt4.h"
> #include "poppler-private.h"
> 
>diff --git a/qt4/tests/check_goostring.cpp b/qt4/tests/check_goostring.cpp
>index 07999b5..cc2d2cd 100644
>--- a/qt4/tests/check_goostring.cpp
>+++ b/qt4/tests/check_goostring.cpp
>@@ -1,3 +1,5 @@
>+#include "config.h"
>+
> #include <QtTest/QtTest>
> 
> #include "goo/GooString.h"
>diff --git a/qt4/tests/check_lexer.cpp b/qt4/tests/check_lexer.cpp
>index ea834c8..3881224 100644
>--- a/qt4/tests/check_lexer.cpp
>+++ b/qt4/tests/check_lexer.cpp
>@@ -1,3 +1,5 @@
>+#include "config.h"
>+
> #include <QtTest/QtTest>
> 
> #include "Object.h"
>diff --git a/qt4/tests/check_optcontent.cpp b/qt4/tests/check_optcontent.cpp
>index 22b14a4..040b816 100644
>--- a/qt4/tests/check_optcontent.cpp
>+++ b/qt4/tests/check_optcontent.cpp
>@@ -1,3 +1,5 @@
>+#include "config.h"
>+
> #include <QtTest/QtTest>
> 
> #include "PDFDoc.h"
>diff --git a/qt4/tests/check_strings.cpp b/qt4/tests/check_strings.cpp
>index 700ae9c..87f8f36 100644
>--- a/qt4/tests/check_strings.cpp
>+++ b/qt4/tests/check_strings.cpp
>@@ -16,6 +16,8 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
>+
> #include <QtTest/QtTest>
> 
> #include <poppler-qt4.h>
>diff --git a/test/pdf-fullrewrite.cc b/test/pdf-fullrewrite.cc
>index 8108372..5b608af 100644
>--- a/test/pdf-fullrewrite.cc
>+++ b/test/pdf-fullrewrite.cc
>@@ -7,6 +7,7 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include "GlobalParams.h"
> #include "Error.h"
> #include "Object.h"
>diff --git a/test/perf-test-preview-dummy.cc b/test/perf-test-preview-dummy.cc
>index 09f7d0f..7631126 100644
>--- a/test/perf-test-preview-dummy.cc
>+++ b/test/perf-test-preview-dummy.cc
>@@ -6,6 +6,7 @@ Using this perf-test still works for performance testing, you just don't
> get any visual feedback during testing.
> */
> 
>+#include "config.h"
> #include "splash/SplashBitmap.h"
> 
> void PreviewBitmapSplash(SplashBitmap *bmpSplash)
>diff --git a/test/perf-test-preview-win.cc b/test/perf-test-preview-win.cc
>index 2d53335..9fb5d30 100644
>--- a/test/perf-test-preview-win.cc
>+++ b/test/perf-test-preview-win.cc
>@@ -3,6 +3,7 @@
> 
> /* This is a preview support for perf-test for Windows */
> 
>+#include "config.h"
> #include <windows.h>
> #include <assert.h>
> 
>diff --git a/test/perf-test.cc b/test/perf-test.cc
>index 84bbcda..8499d49 100644
>--- a/test/perf-test.cc
>+++ b/test/perf-test.cc
>@@ -15,6 +15,8 @@
>      of a previous run.
> */
> 
>+#include "config.h"
>+
> #ifdef _MSC_VER
> // this sucks but I don't know any other way
> #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
>@@ -33,7 +35,6 @@
> //#define COPY_FILE 1
> 
> #include <assert.h>
>-#include <config.h>
> #include <stdio.h>
> #include <stdarg.h>
> #include <ctype.h>
>diff --git a/utils/HtmlFonts.cc b/utils/HtmlFonts.cc
>index d8334bc..c37723a 100644
>--- a/utils/HtmlFonts.cc
>+++ b/utils/HtmlFonts.cc
>@@ -31,6 +31,7 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include "HtmlFonts.h"
> #include "HtmlUtils.h"
> #include "GlobalParams.h"
>diff --git a/utils/HtmlLinks.cc b/utils/HtmlLinks.cc
>index 1d609f6..48f8754 100644
>--- a/utils/HtmlLinks.cc
>+++ b/utils/HtmlLinks.cc
>@@ -25,6 +25,7 @@
> //
> //========================================================================
> 
>+#include "config.h"
> #include "HtmlLinks.h"
> 
> extern GBool xml;
>diff --git a/utils/parseargs.cc b/utils/parseargs.cc
>index a457a88..b66086f 100644
>--- a/utils/parseargs.cc
>+++ b/utils/parseargs.cc
>@@ -23,6 +23,8 @@
> 
> ========================================================================*/
> 
>+#include "config.h"
>+
> #include <stdio.h>
> #include <stddef.h>
> #include <string.h>
>diff --git a/utils/pdfunite.cc b/utils/pdfunite.cc
>index 071a0d3..f4ecd23 100644
>--- a/utils/pdfunite.cc
>+++ b/utils/pdfunite.cc
>@@ -11,10 +11,11 @@
> // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
> //
> //========================================================================
>+
>+#include "config.h"
> #include <PDFDoc.h>
> #include <GlobalParams.h>
> #include "parseargs.h"
>-#include "config.h"
> #include <poppler-config.h>
> #include <vector>
> 
>diff --git a/utils/printencodings.cc b/utils/printencodings.cc
>index dec6f98..581b3c4 100644
>--- a/utils/printencodings.cc
>+++ b/utils/printencodings.cc
>@@ -16,6 +16,7 @@
>  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
>  */
> 
>+#include "config.h"
> #include "printencodings.h"
> 
> #include "GlobalParams.h"
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 60095: 74006 | 74007 | 74119 | 74120 | 74121 | 74122 | 74285

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.