File source-poppler.dif of Package texlive-bin

--- texk/web2c/xetexdir/XeTeX_ext.c
+++ texk/web2c/xetexdir/XeTeX_ext.c	2009-09-04 08:40:23.593902337 +0000
@@ -39,15 +39,15 @@ authorization from the copyright holders
 #include <kpathsea/config.h>
 
 #ifdef XETEX_OTHER
-#ifdef POPPLER_VERSION
-#define xpdfVersion POPPLER_VERSION
-#define xpdfString "poppler"
-#include "poppler-config.h"
-#else
-#define xpdfString "xpdf"
-#include "xpdf/config.h"
-#endif
-#include "png.h"
+#  ifdef POPPLER_VERSION
+#  define xpdfVersion POPPLER_VERSION
+#    define xpdfString "poppler"
+#    include <poppler-config.h>
+#  else
+#    define xpdfString "xpdf"
+#    include "xpdf/config.h"
+#  endif
+#  include "png.h"
 #endif
 
 #include "zlib.h"
--- texk/web2c/xetexdir/pdfimage.cpp
+++ texk/web2c/xetexdir/pdfimage.cpp	2009-09-04 08:44:54.178401384 +0000
@@ -33,19 +33,27 @@ authorization from the copyright holders
 #include "pdfimage.h"
 
 #ifdef POPPLER_VERSION
-#include <dirent.h>
-#include <poppler-config.h>
-#include <goo/GooString.h>
-#include <goo/gmem.h>
-#include <goo/gfile.h>
-#define GString GooString
+#  include <dirent.h>
+#  include <poppler-config.h>
+#  include <goo/GooString.h>
+#  include <goo/gmem.h>
+#  include <goo/gfile.h>
+#  define GString GooString
 #else
-#include "goo/GString.h"
+#  include "goo/GString.h"
 #endif
-
-#include "PDFDoc.h"
-#include "Catalog.h"
-#include "Page.h"
+#include <Object.h>
+#include <Stream.h>
+#include <Array.h>
+#include <Dict.h>
+#include <XRef.h>
+#include <Link.h>
+#include <Catalog.h>
+#include <Page.h>
+#include <GfxFont.h>
+#include <PDFDoc.h>
+#include <GlobalParams.h>
+#include <Error.h>
 
 #include "XeTeX_ext.h"
 
--- texk/web2c/xetexdir/xetexextra.in
+++ texk/web2c/xetexdir/xetexextra.in	2009-09-04 08:46:29.257902488 +0000
@@ -54,7 +54,11 @@ You should have received a copy of the G
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#define BANNER "This is XeTeX, Version 3.1415926-ETEX-VERSION-XETEX-VERSION"
+#ifdef POPPLER_VERSION
+#  define BANNER "This is XeTeX using libpoppler, Version 3.1415926-ETEX-VERSION-XETEX-VERSION"
+#else
+#  define BANNER "This is XeTeX, Version 3.1415926-ETEX-VERSION-XETEX-VERSION"
+#endif
 #define COPYRIGHT_HOLDER "SIL International and Jonathan Kew"
 #define AUTHOR "Jonathan Kew"
 #define PROGRAM_HELP XETEXHELP
--- texk/web2c/luatexdir/utils/utils.w
+++ texk/web2c/luatexdir/utils/utils.w	2010-11-12 12:17:52.368425494 +0000
@@ -51,7 +51,7 @@ static const char _svn_version[] =
 #include "png.h"
 #ifdef POPPLER_VERSION
 #  define xpdfString "poppler"
-#  include "poppler-config.h"
+#  include <poppler-config.h>
 #  define xpdfVersion POPPLER_VERSION
 #else
 #  define xpdfString "xpdf"
--- texk/web2c/luatexdir/image/epdf.h
+++ texk/web2c/luatexdir/image/epdf.h	2010-11-12 12:13:21.080425485 +0000
@@ -31,6 +31,9 @@
 #  include <string.h>
 #  include <kpathsea/c-ctype.h>
 #  include <sys/stat.h>
+extern "C" {
+#include <config.h>
+}
 #  ifdef POPPLER_VERSION
 #    define GString GooString
 #    include <dirent.h>
@@ -43,20 +46,20 @@
 #    include <GString.h>
 #    include <gmem.h>
 #    include <gfile.h>
-#    include <assert.h>
 #  endif
-#  include "Object.h"
-#  include "Stream.h"
-#  include "Array.h"
-#  include "Dict.h"
-#  include "XRef.h"
-#  include "Catalog.h"
-#  include "Link.h"
-#  include "Page.h"
-#  include "GfxFont.h"
-#  include "PDFDoc.h"
-#  include "GlobalParams.h"
-#  include "Error.h"
+#  include <assert.h>
+#  include <Object.h>
+#  include <Stream.h>
+#  include <Array.h>
+#  include <Dict.h>
+#  include <XRef.h>
+#  include <Catalog.h>
+#  include <Link.h>
+#  include <Page.h>
+#  include <GfxFont.h>
+#  include <PDFDoc.h>
+#  include <GlobalParams.h>
+#  include <Error.h>
 
 extern "C" {
 
--- texk/web2c/pdftexdir/pdftexextra.in
+++ texk/web2c/pdftexdir/pdftexextra.in	2009-09-04 08:42:10.857902597 +0000
@@ -25,7 +25,11 @@ Franklin Street, Fifth Floor, Boston, MA
    (generated from ../lib/texmfmp.c).
 */
 
-#define BANNER "This is pdfTeX, Version 3.1415926-PDFTEX-VERSION-ETEX-VERSION"
+#ifdef POPPLER_VERSION
+#  define BANNER "This is pdfTeX using libpoppler, Version 3.1415926-PDFTEX-VERSION-ETEX-VERSION"
+#else
+#  define BANNER "This is pdfTeX, Version 3.1415926-PDFTEX-VERSION-ETEX-VERSION"
+#endif
 #define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
 #define AUTHOR NULL
 #define PROGRAM_HELP PDFTEXHELP
--- texk/web2c/pdftexdir/pdftoepdf.cc
+++ texk/web2c/pdftexdir/pdftoepdf.cc	2010-11-12 12:15:38.192425700 +0000
@@ -22,44 +22,41 @@ Franklin Street, Fifth Floor, Boston, MA
    conflicting with the definition for Pascal's boolean as 'int'
    in <kpathsea/types.h>.
 */
-#define boolean MINGW32_boolean
-
 #include <stdlib.h>
 #include <math.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-
+extern "C" {
+#include <config.h>
+}
 #ifdef POPPLER_VERSION
-#include <dirent.h>
-#include <poppler-config.h>
-#include <goo/GooString.h>
-#include <goo/gmem.h>
-#include <goo/gfile.h>
-#define GString GooString
+#  include <dirent.h>
+#  include <poppler-config.h>
+#  include <goo/GooString.h>
+#  include <goo/gmem.h>
+#  include <goo/gfile.h>
+#  define GString GooString
 #else
-#include <aconf.h>
-#include <GString.h>
-#include <gmem.h>
-#include <gfile.h>
-#include <assert.h>
+#  include <aconf.h>
+#  include <GString.h>
+#  include <gmem.h>
+#  include <gfile.h>
 #endif
-
-#include "Object.h"
-#include "Stream.h"
-#include "Array.h"
-#include "Dict.h"
-#include "XRef.h"
-#include "Catalog.h"
-#include "Link.h"
-#include "Page.h"
-#include "GfxFont.h"
-#include "PDFDoc.h"
-#include "GlobalParams.h"
-#include "Error.h"
-
-#undef boolean
+#include <assert.h>
+#include <Object.h>
+#include <Stream.h>
+#include <Array.h>
+#include <Dict.h>
+#include <XRef.h>
+#include <Catalog.h>
+#include <Link.h>
+#include <Page.h>
+#include <GfxFont.h>
+#include <PDFDoc.h>
+#include <GlobalParams.h>
+#include <Error.h>
 
 // This file is mostly C and not very much C++; it's just used to interface
 // the functions of xpdf, which happens to be written in C++.
--- texk/web2c/pdftexdir/pdftosrc.cc
+++ texk/web2c/pdftexdir/pdftosrc.cc	2009-09-04 08:56:09.694401252 +0000
@@ -23,33 +23,35 @@ Franklin Street, Fifth Floor, Boston, MA
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-
+extern "C" {
+#include <config.h>
+}
 #ifdef POPPLER_VERSION
-#define GString GooString
-#define xpdfVersion POPPLER_VERSION
-#include <dirent.h>
-#include <goo/GooString.h>
-#include <goo/gmem.h>
-#include <goo/gfile.h>
+#  define GString GooString
+#  define xpdfVersion POPPLER_VERSION
+#  include <dirent.h>
+#  include <goo/GooString.h>
+#  include <goo/gmem.h>
+#  include <goo/gfile.h>
 #else
-#include <aconf.h>
-#include <assert.h>
-#include <GString.h>
-#include <gmem.h>
-#include <gfile.h>
+#  include <aconf.h>
+#  include <GString.h>
+#  include <gmem.h>
+#  include <gfile.h>
 #endif
-
-#include "Object.h"
-#include "Stream.h"
-#include "Array.h"
-#include "Dict.h"
-#include "XRef.h"
-#include "Catalog.h"
-#include "Page.h"
-#include "GfxFont.h"
-#include "PDFDoc.h"
-#include "GlobalParams.h"
-#include "Error.h"
+#include <assert.h>
+#include <Object.h>
+#include <Stream.h>
+#include <Array.h>
+#include <Dict.h>
+#include <XRef.h>
+#include <Link.h>
+#include <Catalog.h>
+#include <Page.h>
+#include <GfxFont.h>
+#include <PDFDoc.h>
+#include <GlobalParams.h>
+#include <Error.h>
 
 static XRef *xref = 0;
 
--- texk/web2c/pdftexdir/utils.c
+++ texk/web2c/pdftexdir/utils.c	2009-09-04 08:38:04.370467045 +0000
@@ -43,12 +43,12 @@ Franklin Street, Fifth Floor, Boston, MA
 #include "ptexlib.h"
 #include "png.h"
 #ifdef POPPLER_VERSION
-#include "poppler-config.h"
-#define xpdfVersion POPPLER_VERSION
-#define xpdfString "poppler"
+#  include <poppler-config.h>
+#  define xpdfVersion POPPLER_VERSION
+#  define xpdfString "poppler"
 #else
-#include "xpdf/config.h"        /* just to get the xpdf version */
-#define xpdfString "xpdf"
+#  include "xpdf/config.h"        /* just to get the xpdf version */
+#  define xpdfString "xpdf"
 #endif
 
 #define check_nprintf(size_get, size_want) \
--- texk/web2c/pdftexdir/writefont.c
+++ texk/web2c/pdftexdir/writefont.c	2009-09-04 08:39:18.889901645 +0000
@@ -18,6 +18,9 @@ with pdfTeX; if not, write to the Free S
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#ifdef POPPLER_VERSION
+#  include <goo/gmem.h>
+#endif
 #include "ptexlib.h"
 
 /**********************************************************************/