github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-01-29 13:50:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the MS-Windows MinGW build

Browse Source 
* build_w32.bat (GccCompile): Use -std=gnu99, as some code uses
C99 features ('for' loop initial declarations).

* dir.c (print_dir_data_base) [WINDOWS32]: Cast 'mtime' to
'int64_t', and use %I64d to print it, to avoid compile-time
warning about printing a 'time_t' value, which could be either
a 32-bit or a 64 bit integral type.
This commit is contained in:
Eli Zaretskii 2016-04-24 09:53:38 +03:00
parent 7241d136f4
commit 6e640321fd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_w32.bat
View File

@ -157,7 +157,7 @@ goto :EOF
:GccCompile :GccCompile
:: GCC Compile :: GCC Compile
echo on echo on
gcc -mthreads -Wall -gdwarf-2 -g3 %OPTS% -I%OUTDIR% -I. -I./glob -I./w32/include -DWINDOWS32 -DHAVE_CONFIG_H %EXTRAS% -o %OUTDIR%\%1.o -c %1.c gcc -mthreads -Wall -std=gnu99 -gdwarf-2 -g3 %OPTS% -I%OUTDIR% -I. -I./glob -I./w32/include -DWINDOWS32 -DHAVE_CONFIG_H %EXTRAS% -o %OUTDIR%\%1.o -c %1.c
@echo off @echo off
goto :EOF goto :EOF

10
dir.c
View File

@ -1082,8 +1082,9 @@ print_dir_data_base (void)
else if (dir->contents->dirfiles.ht_vec == 0) else if (dir->contents->dirfiles.ht_vec == 0)
{ {
#ifdef WINDOWS32 #ifdef WINDOWS32
printf (_("# %s (key %s, mtime %d): could not be opened.\n"), printf (_("# %s (key %s, mtime %I64d): could not be opened.\n"),
dir->name, dir->contents->path_key,dir->contents->mtime); dir->name, dir->contents->path_key,
(int64_t)dir->contents->mtime);
#else /* WINDOWS32 */ #else /* WINDOWS32 */
#ifdef VMS_INO_T #ifdef VMS_INO_T
printf (_("# %s (device %d, inode [%d,%d,%d]): could not be opened.\n"), printf (_("# %s (device %d, inode [%d,%d,%d]): could not be opened.\n"),
@ -1118,8 +1119,9 @@ print_dir_data_base (void)
} }
} }
#ifdef WINDOWS32 #ifdef WINDOWS32
printf (_("# %s (key %s, mtime %d): "), printf (_("# %s (key %s, mtime %I64d): "),
dir->name, dir->contents->path_key, dir->contents->mtime); dir->name, dir->contents->path_key,
(int64_t)dir->contents->mtime);
#else /* WINDOWS32 */ #else /* WINDOWS32 */
#ifdef VMS_INO_T #ifdef VMS_INO_T
printf (_("# %s (device %d, inode [%d,%d,%d]): "), printf (_("# %s (device %d, inode [%d,%d,%d]): "),