diff options
Diffstat (limited to 'Build/source/libs/poppler/poppler-src/goo/gfile.h')
-rw-r--r-- | Build/source/libs/poppler/poppler-src/goo/gfile.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Build/source/libs/poppler/poppler-src/goo/gfile.h b/Build/source/libs/poppler/poppler-src/goo/gfile.h index 1365a9cf2ab..805e5232262 100644 --- a/Build/source/libs/poppler/poppler-src/goo/gfile.h +++ b/Build/source/libs/poppler/poppler-src/goo/gfile.h @@ -19,9 +19,10 @@ // Copyright (C) 2009, 2011, 2012 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net> // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com> -// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com> +// Copyright (C) 2013, 2017 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com> // Copyright (C) 2014 Peter Breitenlohner <peb@mppmu.mpg.de> +// Copyright (C) 2017 Christoph Cullmann <cullmann@kde.org> // // 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 @@ -52,21 +53,21 @@ extern "C" { #else # include <unistd.h> # include <sys/types.h> -# ifdef VMS +# if defined(VMS) # include "vms_dirent.h" -# elif HAVE_DIRENT_H +# elif defined(HAVE_DIRENT_H) # include <dirent.h> # define NAMLEN(d) strlen((d)->d_name) # else # define dirent direct # define NAMLEN(d) (d)->d_namlen -# if HAVE_SYS_NDIR_H +# ifdef HAVE_SYS_NDIR_H # include <sys/ndir.h> # endif -# if HAVE_SYS_DIR_H +# ifdef HAVE_SYS_DIR_H # include <sys/dir.h> # endif -# if HAVE_NDIR_H +# ifdef HAVE_NDIR_H # include <ndir.h> # endif # endif @@ -104,7 +105,7 @@ extern time_t getModTime(char *fileName); // should be "w" or "wb". Returns true on success. extern GBool openTempFile(GooString **name, FILE **f, const char *mode); -#ifdef WIN32 +#ifdef _WIN32 // Convert a file name from Latin-1 to UTF-8. extern GooString *fileNameToUTF8(char *path); @@ -194,7 +195,7 @@ private: GooString *path; // directory path GBool doStat; // call stat() for each entry? #if defined(_WIN32) - WIN32_FIND_DATA ffd; + WIN32_FIND_DATAA ffd; HANDLE hnd; #elif defined(ACORN) #elif defined(MACOS) |