better way to avoid compiler warnings

git-svn-id: svn://tug.org/texlive/trunk@17640 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 5 insertions, 5 deletions

diff --git a/Build/source/texk/xdvipdfmx/src/dpxfile.c b/Build/source/texk/xdvipdfmx/src/dpxfile.c
index eca78d0f9ce..09e7c4df6cc 100644
--- a/Build/source/texk/xdvipdfmx/src/dpxfile.c
+++ b/Build/source/texk/xdvipdfmx/src/dpxfile.c
@@ -44,6 +44,8 @@ dpx_file_set_verbose (void)
 }
 
 
+#define mystrdup(s1)              (char *) MEM_ADD(strdup(s1))
+
 /* Kpathsea library does not check file type. */
 static int qcheck_filetype (const char *fqpn, int type);
 
@@ -538,7 +540,7 @@ dpx_find_type1_file (const char *filename)
   char  *fqpn = NULL;
 
   if (is_absolute_path(filename))
-    fqpn = strdup(filename);
+    fqpn = mystrdup(filename);
   else
     fqpn = kpse_find_file(filename, kpse_type1_format, 0);
   if (fqpn && !qcheck_filetype(fqpn, DPX_RES_TYPE_T1FONT)) {
@@ -556,7 +558,7 @@ dpx_find_truetype_file (const char *filename)
   char  *fqpn = NULL;
 
   if (is_absolute_path(filename))
-    fqpn = strdup(filename);
+    fqpn = mystrdup(filename);
   else
     fqpn = kpse_find_file(filename, kpse_truetype_format, 0);
   if (fqpn && !qcheck_filetype(fqpn, DPX_RES_TYPE_TTFONT)) {
@@ -577,7 +579,7 @@ dpx_find_opentype_file (const char *filename)
   q = ensuresuffix(filename, ".otf");
 #ifndef MIKTEX
   if (is_absolute_path(q))
-    fqpn = strdup(q);
+    fqpn = mystrdup(q);
   else
     fqpn = kpse_find_file(q, kpse_opentype_format, 0);
   if (!fqpn) {
diff --git a/Build/source/texk/xdvipdfmx/src/mem.h b/Build/source/texk/xdvipdfmx/src/mem.h
index c533ca8acbd..6380e9e9125 100644
--- a/Build/source/texk/xdvipdfmx/src/mem.h
+++ b/Build/source/texk/xdvipdfmx/src/mem.h
@@ -63,6 +63,4 @@ extern void *mem_remove (void *ptr);
 #define kpse_find_file(x,y,z)     (char *) MEM_ADD(kpse_find_file(x,y,z))
 #define kpse_find_glyph(x,y,z,w)  (char *) MEM_ADD(kpse_find_glyph(x,y,z,w))
 
-#undef strdup
-#define strdup(s1)                (char *) MEM_ADD(strdup(s1))
 #endif /* _MEM_H_ */