texlive[42208] Build/source/texk/dvipdfm-x: dvipdfm-x/dpxfile.c: Use

[commits+kakuto at tug.org]

Revision: 42208
          http://tug.org/svn/texlive?view=revision&revision=42208
Author:   kakuto
Date:     2016-10-05 00:07:30 +0200 (Wed, 05 Oct 2016)
Log Message:
-----------
dvipdfm-x/dpxfile.c: Use PATH_MAX instead of _MAX_PATH

Modified Paths:
--------------
    trunk/Build/source/texk/dvipdfm-x/ChangeLog
    trunk/Build/source/texk/dvipdfm-x/dpxfile.c

Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog	2016-10-04 21:34:29 UTC (rev 42207)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog	2016-10-04 22:07:30 UTC (rev 42208)
@@ -1,3 +1,7 @@
+2016-10-04  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* dpxfile.c: Use PATH_MAX instead of _MAX_PATH.
+
 2016-10-03  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* dpxfile.c: Sync with MikTeX.

Modified: trunk/Build/source/texk/dvipdfm-x/dpxfile.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/dpxfile.c	2016-10-04 21:34:29 UTC (rev 42207)
+++ trunk/Build/source/texk/dvipdfm-x/dpxfile.c	2016-10-04 22:07:30 UTC (rev 42208)
@@ -62,9 +62,8 @@
 #endif
 
 #if defined(MIKTEX)
-#if defined(__APPLE__)
-#include <sys/syslimits.h>
-#  define _MAX_PATH     PATH_MAX
+#if !defined(PATH_MAX)
+#  define PATH_MAX 256
 #endif
 #endif
 
@@ -85,7 +84,6 @@
 #if defined(TESTCOMPILE) && !defined(MIKTEX)
 #  define MIKTEX        1
 #  define PATH_SEP_CHR  '/'
-#  define _MAX_PATH     256
 
 static int
 miktex_get_acrobat_font_dir (char *buf)
@@ -103,7 +101,7 @@
   fqpn = kpse_path_search(dirlist, filename, 0);
   if (!fqpn)
     return  0;
-  if (strlen(fqpn) > _MAX_PATH)
+  if (strlen(fqpn) > PATH_MAX)
     r = 0;
   else {
     strcpy(buf, fqpn);
@@ -126,7 +124,7 @@
 
   if (!fqpn)
     return  0;
-  if (strlen(fqpn) > _MAX_PATH)
+  if (strlen(fqpn) > PATH_MAX)
     r = 0;
   else {
     strcpy(buf, fqpn);
@@ -147,7 +145,7 @@
 
   if (!fqpn)
     return  0;
-  if (strlen(fqpn) > _MAX_PATH)
+  if (strlen(fqpn) > PATH_MAX)
     r = 0;
   else {
     strcpy(buf, fqpn);
@@ -164,7 +162,7 @@
 #ifndef PATH_SEP_CHR
 #  define PATH_SEP_CHR '\\'
 #endif
-static char  _tmpbuf[_MAX_PATH+1];
+static char  _tmpbuf[PATH_MAX+1];
 #endif /* MIKTEX */
 
 static int exec_spawn (char *cmd)
@@ -560,11 +558,11 @@
 #if  defined(MIKTEX_NO_KPATHSEA)
   /* Find in Acrobat's Resource/CMap dir */
   {
-    char  _acrodir[_MAX_PATH+1];
+    char  _acrodir[PATH_MAX+1];
     char  *q;
     int    r;
 
-    memset(_acrodir, 0, _MAX_PATH+1);
+    memset(_acrodir, 0, PATH_MAX+1);
     r = miktex_get_acrobat_font_dir(_acrodir);
     if (r &&
         strlen(_acrodir) > strlen("Font")) {
@@ -582,7 +580,7 @@
         }
       }
     }
-    memset(_tmpbuf, 0, _MAX_PATH+1);
+    memset(_tmpbuf, 0, PATH_MAX+1);
   }
 #else
   fqpn = kpse_find_file(filename, kpse_cmap_format, 0); 
@@ -829,7 +827,7 @@
 
 #if defined(MIKTEX)
   {
-    tmp = NEW(_MAX_PATH + 1, char);
+    tmp = NEW(PATH_MAX + 1, char);
     miktex_create_temp_file_name(tmp); /* FIXME_FIXME */
 #if defined(MIKTEX_WINDOWS)
     {