diff options
Diffstat (limited to 'Build/source/libs')
-rw-r--r-- | Build/source/libs/poppler/TLpatches/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/poppler/TLpatches/patch-05-w32 | 19 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-src/goo/gfile.cc | 2 |
3 files changed, 25 insertions, 0 deletions
diff --git a/Build/source/libs/poppler/TLpatches/ChangeLog b/Build/source/libs/poppler/TLpatches/ChangeLog index 629722ebf90..0dc44506fc2 100644 --- a/Build/source/libs/poppler/TLpatches/ChangeLog +++ b/Build/source/libs/poppler/TLpatches/ChangeLog @@ -1,3 +1,7 @@ +2018-03-20 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * patch-05-w32: Added to compile gfile.cc on Windows. + 2018-03-18 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * Import poppler-0.63.0. diff --git a/Build/source/libs/poppler/TLpatches/patch-05-w32 b/Build/source/libs/poppler/TLpatches/patch-05-w32 new file mode 100644 index 00000000000..8c77eea5599 --- /dev/null +++ b/Build/source/libs/poppler/TLpatches/patch-05-w32 @@ -0,0 +1,19 @@ +diff -ur poppler-0.63.0/goo/gfile.cc poppler-src/goo/gfile.cc +--- poppler-0.63.0/goo/gfile.cc Mon Mar 19 03:23:49 2018 ++++ poppler-src/goo/gfile.cc Wed Mar 21 05:50:42 2018 +@@ -65,6 +65,7 @@ + #define PATH_MAX 1024 + #endif + ++#if !defined(_WIN32) + namespace { + + template< typename... > +@@ -99,6 +100,7 @@ + + } + ++#endif /* !_WIN32 */ + //------------------------------------------------------------------------ + + GooString *getCurrentDir() { diff --git a/Build/source/libs/poppler/poppler-src/goo/gfile.cc b/Build/source/libs/poppler/poppler-src/goo/gfile.cc index 218882d32d7..bea6bb61543 100644 --- a/Build/source/libs/poppler/poppler-src/goo/gfile.cc +++ b/Build/source/libs/poppler/poppler-src/goo/gfile.cc @@ -65,6 +65,7 @@ #define PATH_MAX 1024 #endif +#if !defined(_WIN32) namespace { template< typename... > @@ -99,6 +100,7 @@ inline const struct timespec& mtim(const struct stat& stbuf) { } +#endif /* !_WIN32 */ //------------------------------------------------------------------------ GooString *getCurrentDir() { |