[poppler] Branch 'poppler-0.26' - poppler/poppler-config.h.cmake

Pino Toscano pino at kemper.freedesktop.org
Fri Jul 11 23:36:22 PDT 2014


 poppler/poppler-config.h.cmake |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit e82a24a585d251f767725f61700dc1f8fe169a52
Author: Pino Toscano <pino at kde.org>
Date:   Sat Jul 12 08:35:45 2014 +0200

    cmake: sync poppler-config.h.cmake with poppler-config.h.in

diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake
index b04f2bf..d7918bc 100644
--- a/poppler/poppler-config.h.cmake
+++ b/poppler/poppler-config.h.cmake
@@ -14,6 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2014 Bogdan Cristea <cristeab at gmail.com>
+// Copyright (C) 2014 Hib Eris <hib at hiberis.nl>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -23,12 +24,14 @@
 #ifndef POPPLER_CONFIG_H
 #define POPPLER_CONFIG_H
 
+#include <stdio.h>
+
 // We duplicate some of the config.h #define's here since they are
 // used in some of the header files we install.  The #ifndef/#endif
 // around #undef look odd, but it's to silence warnings about
 // redefining those symbols.
 
-/* Defines the poppler version */
+/* Defines the poppler version. */
 #ifndef POPPLER_VERSION
 #define POPPLER_VERSION "${POPPLER_VERSION}"
 #endif
@@ -174,7 +177,7 @@ char * strtok_r (char *s, const char *delim, char **save_ptr);
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
 #ifdef __MINGW_PRINTF_FORMAT
 #define GCC_PRINTF_FORMAT(fmt_index, va_index) \
-       __attribute__((__format__(__MINGW_PRINTF_FORMAT, fmt_index, va_index)))
+	__attribute__((__format__(__MINGW_PRINTF_FORMAT, fmt_index, va_index)))
 #else
 #define GCC_PRINTF_FORMAT(fmt_index, va_index) \
 	__attribute__((__format__(__printf__, fmt_index, va_index)))


More information about the poppler mailing list