X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=pdf%2Fxpdf%2Fxpdfconfig.h;h=bf6baf4bf985ad3b9482d2a5fdee557dd6a129fe;hb=5932479cc8c371a385616b5909df558a091b7111;hp=bb6eab933e4b75d9ba5855d3aacaeec17648dd03;hpb=64676031423465996e83c4a685290f0c3d97a249;p=evince.git

diff --git a/pdf/xpdf/xpdfconfig.h b/pdf/xpdf/xpdfconfig.h
index bb6eab93..bf6baf4b 100644
--- a/pdf/xpdf/xpdfconfig.h
+++ b/pdf/xpdf/xpdfconfig.h
@@ -2,7 +2,7 @@
 //
 // config.h
 //
-// Copyright 1996-2002 Glyph & Cog, LLC
+// Copyright 1996-2004 Glyph & Cog, LLC
 //
 //========================================================================
 
@@ -14,22 +14,23 @@
 //------------------------------------------------------------------------
 
 // xpdf version
-#define xpdfVersion         "2.00"
-#define xpdfVersionNum      2.00
-#define xpdfMajorVersion    2
+#define xpdfVersion         "3.00"
+#define xpdfVersionNum      3.00
+#define xpdfMajorVersion    3
 #define xpdfMinorVersion    0
-#define xpdfMajorVersionStr "2"
+#define xpdfMajorVersionStr "3"
+#define xpdfMinorVersionStr "0"
 
 // supported PDF version
-#define supportedPDFVersionStr "1.4"
-#define supportedPDFVersionNum 1.4
+#define supportedPDFVersionStr "1.5"
+#define supportedPDFVersionNum 1.5
 
 // copyright notice
-#define xpdfCopyright "Copyright 1996-2002 Glyph & Cog, LLC"
+#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC"
 
 // Windows resource file stuff
-#define winxpdfVersion "WinXpdf 2.00"
-#define xpdfCopyrightAmp "Copyright 1996-2002 Glyph && Cog, LLC"
+#define winxpdfVersion "WinXpdf 3.00"
+#define xpdfCopyrightAmp "Copyright 1996-2004 Glyph && Cog, LLC"
 
 //------------------------------------------------------------------------
 // paper size
@@ -81,7 +82,7 @@
 // popen
 //------------------------------------------------------------------------
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__)
 #define popen _popen
 #define pclose _pclose
 #endif
@@ -100,7 +101,7 @@
 #undef CDECL
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__)
 #define CDECL __cdecl
 #else
 #define CDECL