From ab399d16f49b986d1de514b2fb8434872decf91d Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Mon, 4 Jul 2016 22:07:54 +0000 Subject: dvisvgm 1.16 git-svn-id: svn://tug.org/texlive/trunk@41628 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Build/source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp') diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp index 0ba2b6a0c00..2388f737bb2 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp +++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp @@ -38,7 +38,7 @@ string Ghostscript::LIBGS_NAME; #ifndef HAVE_LIBGS -#ifdef __WIN32__ +#ifdef _WIN32 /** Looks up the path of the Ghostscript DLL in the Windows registry and returns it. * If there is no proper registry entry, the returned string is empty. */ static string get_path_from_registry () { @@ -79,7 +79,7 @@ static string get_path_from_registry () { #endif // RRF_RT_REG_SZ return ""; } -#endif // __WIN32__ +#endif // _WIN32 /** Try to detect name of the Ghostscript shared library depending on the user settings. @@ -98,7 +98,7 @@ static string get_libgs (const string &fname) { if (const char *gsdll_path = FileFinder::lookup(gsdll)) return gsdll_path; #endif // MIKTEX -#if defined(__WIN32__) +#if defined(_WIN32) // try to look up the path of the Ghostscript DLL in the Windows registry string gsdll_path = get_path_from_registry(); if (!gsdll_path.empty()) @@ -106,7 +106,7 @@ static string get_libgs (const string &fname) { #endif #if defined(__WIN64__) return "gsdll64.dll"; -#elif defined(__WIN32__) +#elif defined(_WIN32) return "gsdll32.dll"; #else // try to find libgs.so.X on the user's system @@ -340,7 +340,7 @@ const char* Ghostscript::error_name (int code) { #if defined(HAVE_LIBGS) // use array defined in libgs to avoid linking the error strings into the binary return gs_error_names[code-1]; -#elif defined(__WIN32__) +#elif defined(_WIN32) // gs_error_names is private in the Ghostscript DLL so we can't access it here return error_names[code-1]; #else -- cgit v1.2.3