[poppler] 2 commits - poppler/poppler-config.h.cmake poppler/XRef.cc

[Pino Toscano]

 poppler/XRef.cc                |    2 +-
 poppler/poppler-config.h.cmake |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit eb5ce6990522bac91d8f5d0d3636c46178386d25
Author: Pino Toscano <pino at kde.org>
Date:   Sun Jan 27 15:20:42 2013 +0100

    avoid max() macro expansion
    
    protect against compilers defining max as macro

diff --git a/poppler/XRef.cc b/poppler/XRef.cc
index deac6d7..6aa168e 100644
--- a/poppler/XRef.cc
+++ b/poppler/XRef.cc
@@ -852,7 +852,7 @@ GBool XRef::readXRefStreamSection(Stream *xrefStr, int *w, int first, int n) {
       }
       offset = (offset << 8) + c;
     }
-    if (offset > (unsigned long long)std::numeric_limits<Goffset>::max()) {
+    if (offset > (unsigned long long)(std::numeric_limits<Goffset>::max)()) {
       error(errSyntaxError, -1, "Offset inside xref table too large for fseek");
       return gFalse;
     }
commit 6b716b1ab60b573b5770d8636992247387bc3513
Author: Pino Toscano <pino at kde.org>
Date:   Sun Jan 27 15:18:04 2013 +0100

    cmake: provide HAVE_FSEEK64 and HAVE_FSEEKO in poppler-config
    
    followup of a3cee0e7e9dd292c70fe1fa19a92e70bbc1e1b41 also for the cmake-generated poppler-config.h

diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake
index 13a92fe..1fb2999 100644
--- a/poppler/poppler-config.h.cmake
+++ b/poppler/poppler-config.h.cmake
@@ -107,6 +107,12 @@
 #cmakedefine USE_CMS 1
 #endif
 
+/* Define to 1 if you have the `fseek64' function. */
+#cmakedefine HAVE_FSEEK64 1
+
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#cmakedefine HAVE_FSEEKO 1
+
 // Also, there are preprocessor symbols in the header files
 // that are used but never defined when building poppler using configure
 // or cmake: DISABLE_OUTLINE, DEBUG_MEM, SPLASH_CMYK, HAVE_T1LIB_H,