summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-07-04 02:12:36 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-07-04 02:12:36 +0000
commit1adcd6abd66da3bfd2d305c5a14042eda60d0874 (patch)
treedc64e6c52e89579984b3e3d665968c7b9f8944a3
parentfcce66bd92ddcaffab0024a23045c6dc5defa3ff (diff)
Remove redundant cpp macros (w32 only)
git-svn-id: svn://tug.org/texlive/trunk@34515 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog4
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index 65bb8a31c70..bce3844d032 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-04 Akira Kakuto <kakuto@fuk.kinidai.ac.jp>
+
+ * texmfmp.c: Remove redundant cpp macros (w32 only).
+
2014-06-20 Akira Kakuto <kakuto@fuk.kinidai.ac.jp>
* texmfmp.c: Support short-file-name convention (w32 only).
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index f0b7ab9d033..7aae9b5a6a2 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -731,7 +731,9 @@ maininit (int ac, string *av)
#ifdef WIN32
if (main_input_file == NULL) {
string name;
+#ifndef XeTeX
boolean quoted;
+#endif
name = argv[argc-1];
if (name && name[0] != '-' && name[0] != '&' && name[0] != '\\') {
@@ -748,11 +750,9 @@ maininit (int ac, string *av)
#ifdef XeTeX
name = normalize_quotes(argv[argc-1], "argument");
main_input_file = kpse_find_file(argv[argc-1], INPUT_FORMAT, false);
-#ifdef WIN32
change_to_long_name (&main_input_file);
if (main_input_file)
name = normalize_quotes(main_input_file, "argument");
-#endif
argv[argc-1] = name;
#else
name = normalize_quotes(argv[argc-1], "argument");
@@ -763,23 +763,19 @@ maininit (int ac, string *av)
name++;
}
main_input_file = kpse_find_file(name, INPUT_FORMAT, false);
-#ifdef WIN32
change_to_long_name (&main_input_file);
-#endif
if (quoted) {
/* Undo modifications */
name[strlen(name)] = '"';
name--;
}
-#ifdef WIN32
if (main_input_file)
name = normalize_quotes(main_input_file, "argument");
-#endif
argv[argc-1] = name;
#endif
}
}
-#endif
+#endif /* WIN32 */
/* Second chance to activate file:line:error style messages, this
time from texmf.cnf. */