Imported Xpdf 2.03 and fixed build.

[evince.git] / pdf / xpdf / xpdfconfig.h

diff --git a/pdf/xpdf/xpdfconfig.h b/pdf/xpdf/xpdfconfig.h
index c814b88550b945781b17b9fd3979f378a51a719d..ef08a7fe493726a9ec63ce25cbbde69e7bfca893 100644 (file)
--- a/pdf/xpdf/xpdfconfig.h
+++ b/pdf/xpdf/xpdfconfig.h
@@ -2,7 +2,7 @@
 //
 // config.h
 //
 //
 // config.h
 //

-// Copyright 1996-2002 Glyph & Cog, LLC
+// Copyright 1996-2003 Glyph & Cog, LLC

 //
 //========================================================================
 
 //
 //========================================================================
 


@@ -14,15 +14,23 @@
 //------------------------------------------------------------------------
 
 // xpdf version
 //------------------------------------------------------------------------
 
 // xpdf version

-
-#define xpdfVersion "1.01.1"
+#define xpdfVersion         "2.03"
+#define xpdfVersionNum      2.03
+#define xpdfMajorVersion    2
+#define xpdfMinorVersion    3
+#define xpdfMajorVersionStr "2"
+#define xpdfMinorVersionStr "3"

 
 // supported PDF version
 #define supportedPDFVersionStr "1.4"
 #define supportedPDFVersionNum 1.4
 
 // copyright notice
 
 // supported PDF version
 #define supportedPDFVersionStr "1.4"
 #define supportedPDFVersionNum 1.4
 
 // copyright notice

-#define xpdfCopyright "Copyright 1996-2002 Glyph & Cog, LLC"
+#define xpdfCopyright "Copyright 1996-2003 Glyph & Cog, LLC"
+
+// Windows resource file stuff
+#define winxpdfVersion "WinXpdf 2.03"
+#define xpdfCopyrightAmp "Copyright 1996-2003 Glyph && Cog, LLC"

 
 //------------------------------------------------------------------------
 // paper size
 
 //------------------------------------------------------------------------
 // paper size


@@ -74,45 +82,17 @@
 // popen
 //------------------------------------------------------------------------
 
 // popen
 //------------------------------------------------------------------------
 

-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__)

 #define popen _popen
 #define pclose _pclose
 #endif
 
 #define popen _popen
 #define pclose _pclose
 #endif
 

-#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(WIN32) || defined(__DJGPP__) || defined(__CYGWIN32__) || defined(MACOS)
+#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(WIN32) || defined(__DJGPP__) || defined(MACOS)

 #define POPEN_READ_MODE "rb"
 #else
 #define POPEN_READ_MODE "r"
 #endif
 
 #define POPEN_READ_MODE "rb"
 #else
 #define POPEN_READ_MODE "r"
 #endif
 

-//------------------------------------------------------------------------
-// uncompress program
-//------------------------------------------------------------------------
-
-#ifdef HAVE_POPEN
-
-// command to uncompress to stdout
-#  ifdef USE_GZIP
-#    define uncompressCmd "gzip -d -c -q"
-#  else
-#    ifdef __EMX__
-#      define uncompressCmd "compress -d -c"
-#    else
-#      define uncompressCmd "uncompress -c"
-#    endif // __EMX__
-#  endif // USE_GZIP
-
-#else // HAVE_POPEN
-
-// command to uncompress a file
-#  ifdef USE_GZIP
-#    define uncompressCmd "gzip -d -q"
-#  else
-#    define uncompressCmd "uncompress"
-#  endif // USE_GZIP
-
-#endif // HAVE_POPEN
-

 //------------------------------------------------------------------------
 // Win32 stuff
 //------------------------------------------------------------------------
 //------------------------------------------------------------------------
 // Win32 stuff
 //------------------------------------------------------------------------


@@ -121,7 +101,7 @@
 #undef CDECL
 #endif
 
 #undef CDECL
 #endif
 

-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__)

 #define CDECL __cdecl
 #else
 #define CDECL
 #define CDECL __cdecl
 #else
 #define CDECL