Browse Source

Use PAL_MAX_PATH whenever 'MAX_PATH' or 'PATH_MAX' is required

LouYihua 7 years ago
parent
commit
a6ab2bdf37
4 changed files with 6 additions and 10 deletions
  1. 4 0
      common.h
  2. 2 2
      palcfg.c
  3. 0 4
      win32/pal_config.h
  4. 0 4
      winrt/pal_config.h

+ 4 - 0
common.h

@@ -108,6 +108,8 @@
 typedef const BYTE *LPCBYTE;
 # endif
 
+# define PAL_MAX_PATH  MAX_PATH
+
 #else
 
 # include <unistd.h>
@@ -146,6 +148,8 @@ typedef const CHAR         *LPCSTR;
 typedef WCHAR              *LPWSTR;
 typedef const WCHAR        *LPCWSTR;
 
+# define PAL_MAX_PATH  PATH_MAX
+
 #endif
 
 #ifdef __cplusplus

+ 2 - 2
palcfg.c

@@ -487,8 +487,8 @@ PAL_SaveConfig(
 		sprintf(buf, "%s=%s\n", PAL_ConfigName(PALCFG_MUSIC), music_types[gConfig.eMusicType]); fputs(buf, fp);
 		sprintf(buf, "%s=%s\n", PAL_ConfigName(PALCFG_OPL), opl_types[gConfig.eOPLType]); fputs(buf, fp);
 
-		if (gConfig.pszGamePath && *gConfig.pszGamePath && strncmp(gConfig.pszGamePath, PAL_PREFIX, strnlen(gConfig.pszGamePath,PATH_MAX)) != 0) { sprintf(buf, "%s=%s\n", PAL_ConfigName(PALCFG_GAMEPATH), gConfig.pszGamePath); fputs(buf, fp); }
-		if (gConfig.pszSavePath && *gConfig.pszSavePath && strncmp(gConfig.pszSavePath, PAL_SAVE_PREFIX, strnlen(gConfig.pszSavePath,PATH_MAX)) != 0) { sprintf(buf, "%s=%s\n", PAL_ConfigName(PALCFG_SAVEPATH), gConfig.pszSavePath); fputs(buf, fp); }
+		if (gConfig.pszGamePath && *gConfig.pszGamePath && strncmp(gConfig.pszGamePath, PAL_PREFIX, strnlen(gConfig.pszGamePath, PAL_MAX_PATH)) != 0) { sprintf(buf, "%s=%s\n", PAL_ConfigName(PALCFG_GAMEPATH), gConfig.pszGamePath); fputs(buf, fp); }
+		if (gConfig.pszSavePath && *gConfig.pszSavePath && strncmp(gConfig.pszSavePath, PAL_SAVE_PREFIX, strnlen(gConfig.pszSavePath, PAL_MAX_PATH)) != 0) { sprintf(buf, "%s=%s\n", PAL_ConfigName(PALCFG_SAVEPATH), gConfig.pszSavePath); fputs(buf, fp); }
 		if (gConfig.pszMsgFile && *gConfig.pszMsgFile) { sprintf(buf, "%s=%s\n", PAL_ConfigName(PALCFG_MESSAGEFILE), gConfig.pszMsgFile); fputs(buf, fp); }
 		if (gConfig.pszBdfFile && *gConfig.pszBdfFile) { sprintf(buf, "%s=%s\n", PAL_ConfigName(PALCFG_BDFFILE), gConfig.pszBdfFile); fputs(buf, fp); }
 		if (gConfig.pszLogFile) { sprintf(buf, "%s=%s\n", PAL_ConfigName(PALCFG_LOGFILE), gConfig.pszLogFile); fputs(buf, fp); }

+ 0 - 4
win32/pal_config.h

@@ -56,7 +56,3 @@
 #define PAL_HAS_CONFIG_PAGE 1
 
 #define PAL_FILESYSTEM_IGNORE_CASE 1
-
-#ifndef PATH_MAX
-#define PATH_MAX MAX_PATH
-#endif

+ 0 - 4
winrt/pal_config.h

@@ -54,10 +54,6 @@
 
 #define PAL_FILESYSTEM_IGNORE_CASE 1
 
-#ifndef PATH_MAX
-#define PATH_MAX MAX_PATH
-#endif
-
 PAL_C_LINKAGE_BEGIN
 
 LPCSTR