diff options
Diffstat (limited to 'external/poppler/poppler-snprintf.patch.1')
| -rw-r--r-- | external/poppler/poppler-snprintf.patch.1 | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/external/poppler/poppler-snprintf.patch.1 b/external/poppler/poppler-snprintf.patch.1 index f44dad538010..577660580489 100644 --- a/external/poppler/poppler-snprintf.patch.1 +++ b/external/poppler/poppler-snprintf.patch.1 @@ -1,48 +1,33 @@ --- poppler-0.22.5/poppler/Catalog.cc 2013-06-09 12:16:12.000000000 +0200 +++ poppler-0.22.5/poppler/Catalog.cc 2013-07-08 16:54:30.712095880 +0200 -@@ -40,6 +40,14 @@ +@@ -40,6 +40,9 @@ #include <stddef.h> #include <stdlib.h> +#ifdef _WIN32 -+# ifdef __MINGW32__ -+# define LO_SNPRINTF_DLLIMPORT -+# endif -+# ifdef _MSC_VER -+# include <systools/win32/snprintf.h> -+# endif ++# include <systools/win32/snprintf.h> +#endif #include "goo/gmem.h" #include "Object.h" #include "PDFDoc.h" --- poppler-0.22.5/poppler/GlobalParams.cc 2013-03-25 22:48:34.000000000 +0100 +++ poppler-0.22.5/poppler/GlobalParams.cc 2013-07-08 16:55:04.753303654 +0200 -@@ -57,6 +57,12 @@ +@@ -57,6 +57,7 @@ #ifdef _WIN32 # include <shlobj.h> # include <mbstring.h> -+# ifdef __MINGW32__ -+# define LO_SNPRINTF_DLLIMPORT -+# endif -+# ifdef _MSC_VER -+# include <systools/win32/snprintf.h> -+# endif ++# include <systools/win32/snprintf.h> #endif #include "goo/gmem.h" #include "goo/GooString.h" --- poppler-0.22.5/poppler/PageLabelInfo.cc 2013-03-25 22:48:34.000000000 +0100 +++ poppler-0.22.5/poppler/PageLabelInfo.cc 2013-07-08 16:56:47.977901129 +0200 -@@ -17,6 +17,14 @@ +@@ -17,6 +17,9 @@ #include <stdlib.h> #include <stdio.h> #include <assert.h> +#ifdef _WIN32 -+# ifdef __MINGW32__ -+# define LO_SNPRINTF_DLLIMPORT -+# endif -+# ifdef _MSC_VER -+# include <systools/win32/snprintf.h> -+# endif ++# include <systools/win32/snprintf.h> +#endif #include "PageLabelInfo.h" |