summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-07-04 22:07:54 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-07-04 22:07:54 +0000
commitab399d16f49b986d1de514b2fb8434872decf91d (patch)
tree6d3d0faca673d7aa1c0f48ca679ce7841a82e3df /Build/source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp
parentdd2749b37f7b6a9976869e29a028eeab80d686df (diff)
dvisvgm 1.16
git-svn-id: svn://tug.org/texlive/trunk@41628 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp')
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-src/src/Ghostscript.cpp10
1 files changed, 5 insertions, 5 deletions
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