summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-05-09 13:53:07 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-05-09 13:53:07 +0000
commit891c8029d9962eb275e7e01e3e83ff7b9a340164 (patch)
tree1a50e46de8efdf0aa607d5c66ea2a0cbc13c02b2 /Build
parent2b17c8605d5fadc1799fdfdd6507d797cc7cfa8f (diff)
libs/xpdf: On Windows use USERPROFILE instead of HOME
git-svn-id: svn://tug.org/texlive/trunk@37293 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-41-W32TeX24
-rw-r--r--Build/source/libs/xpdf/xpdf-3.04/goo/gfile.cc11
2 files changed, 5 insertions, 30 deletions
diff --git a/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-41-W32TeX b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-41-W32TeX
index 215703697ff..28efb4219f3 100644
--- a/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-41-W32TeX
+++ b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-41-W32TeX
@@ -1,35 +1,19 @@
diff -ur -N xpdf-3.04.orig/goo/gfile.cc xpdf-3.04/goo/gfile.cc
--- xpdf-3.04.orig/goo/gfile.cc 2014-05-30 19:42:41.000000000 +0200
-+++ xpdf-3.04/goo/gfile.cc 2015-05-09 15:26:58.000000000 +0200
-@@ -44,6 +44,11 @@
- #endif
-
- //------------------------------------------------------------------------
-+#ifdef _MSC_VER
-+extern "C" {
-+char *kpse_var_value (char *);
-+}
-+#endif
-
- GString *getHomeDir() {
- #ifdef VMS
-@@ -55,7 +60,15 @@
++++ xpdf-3.04/goo/gfile.cc 2015-05-09 15:49:36.000000000 +0200
+@@ -55,7 +55,11 @@
char *s;
GString *ret;
-+#ifdef_WIN32
-+#ifdef _MSC_VER
-+ if ((s = kpse_var_value("USERPROFILE")))
-+#else
++#ifdef _WIN32
+ if ((s = getenv("USERPROFILE")))
-+#endif
+#else
if ((s = getenv("HOME")))
+#endif
ret = new GString(s);
else
ret = new GString(".");
-@@ -559,7 +572,7 @@
+@@ -559,7 +563,7 @@
GBool createDir(char *path, int mode) {
#ifdef _WIN32
diff --git a/Build/source/libs/xpdf/xpdf-3.04/goo/gfile.cc b/Build/source/libs/xpdf/xpdf-3.04/goo/gfile.cc
index 763fa870884..777870df71b 100644
--- a/Build/source/libs/xpdf/xpdf-3.04/goo/gfile.cc
+++ b/Build/source/libs/xpdf/xpdf-3.04/goo/gfile.cc
@@ -44,11 +44,6 @@
#endif
//------------------------------------------------------------------------
-#ifdef _MSC_VER
-extern "C" {
-char *kpse_var_value (char *);
-}
-#endif
GString *getHomeDir() {
#ifdef VMS
@@ -60,12 +55,8 @@ GString *getHomeDir() {
char *s;
GString *ret;
-#ifdef_WIN32
-#ifdef _MSC_VER
- if ((s = kpse_var_value("USERPROFILE")))
-#else
+#ifdef _WIN32
if ((s = getenv("USERPROFILE")))
-#endif
#else
if ((s = getenv("HOME")))
#endif