diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-10-02 13:48:48 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-10-02 13:48:48 +0000 |
commit | 435af8b2d7de837bb38b5663a1cb7e0df0ddd529 (patch) | |
tree | 9ef9e1177fc3eba1321ca7720084948bba98ee75 /Build/source/texk/dvipsk | |
parent | 1a8b1a1d5865644af82177203a218d99f6c1af98 (diff) |
avoid some WIN32/MINGW compiler warnings
git-svn-id: svn://tug.org/texlive/trunk@19972 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipsk')
-rw-r--r-- | Build/source/texk/dvipsk/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/search.c | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog index 0b523aa46ea..1036a80675a 100644 --- a/Build/source/texk/dvipsk/ChangeLog +++ b/Build/source/texk/dvipsk/ChangeLog @@ -1,3 +1,8 @@ +2010-10-02 Peter Breitenlohner <peb@mppmu.mpg.de> + + * search.c (selfautoloc_prog): #include <kpathsea/concatn.h> + for WIN32 and drop cast of concatn() results. + 2010-06-19 Yan Li <yan.i.li@intel.com> * tfmload.c (name): increase size to 500. diff --git a/Build/source/texk/dvipsk/search.c b/Build/source/texk/dvipsk/search.c index 615802f2b6c..193007c4688 100644 --- a/Build/source/texk/dvipsk/search.c +++ b/Build/source/texk/dvipsk/search.c @@ -70,6 +70,10 @@ quote_name (const char *name) This is a generic function; if we end up needing it in other programs, we should move it to kpathsea. */ +#ifdef WIN32 +#include <kpathsea/concatn.h> +#endif + static char * selfautoloc_prog (const char *prog) { @@ -87,14 +91,14 @@ selfautoloc_prog (const char *prog) while (*r && *r != ' ' && *r != '\t') r++; if (*r == '\0') - ret = (char *)concatn ("\"", selfautoloc, "\\", q, "\"", NULL); + ret = concatn ("\"", selfautoloc, "\\", q, "\"", NULL); else { *r = '\0'; r++; if (*r) - ret = (char *)concatn ("\"", selfautoloc, "\\", q, "\" ", r, NULL); + ret = concatn ("\"", selfautoloc, "\\", q, "\" ", r, NULL); else - ret = (char *)concatn ("\"", selfautoloc, "\\", q, "\"", NULL); + ret = concatn ("\"", selfautoloc, "\\", q, "\"", NULL); } free (q); free (selfautoloc); |