undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/mingw-parameter-less-c-functions'

Browse Source 
Some platform-specific code had non-ANSI strict declarations of C
functions that do not take any parameters, which has been
corrected.

* js/mingw-parameter-less-c-functions:
  mingw: let the build succeed with DEVELOPER=1
This commit is contained in:
Junio C Hamano 2016-07-06 13:38:14 -07:00
commit fd4df42275
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compat/mingw.c
View File

@ -2162,7 +2162,7 @@ int xwcstoutf(char *utf, const wchar_t *wcs, size_t utflen)
return -1; return -1;
} }
static void setup_windows_environment() static void setup_windows_environment(void)
{ {
char *tmp = getenv("TMPDIR"); char *tmp = getenv("TMPDIR");
@ -2204,7 +2204,7 @@ typedef struct {
extern int __wgetmainargs(int *argc, wchar_t ***argv, wchar_t ***env, int glob, extern int __wgetmainargs(int *argc, wchar_t ***argv, wchar_t ***env, int glob,
_startupinfo *si); _startupinfo *si);
static NORETURN void die_startup() static NORETURN void die_startup(void)
{ {
fputs("fatal: not enough memory for initialization", stderr); fputs("fatal: not enough memory for initialization", stderr);
exit(128); exit(128);
@ -2224,7 +2224,7 @@ static char *wcstoutfdup_startup(char *buffer, const wchar_t *wcs, size_t len)
return memcpy(malloc_startup(len), buffer, len); return memcpy(malloc_startup(len), buffer, len);
} }
void mingw_startup() void mingw_startup(void)
{ {
int i, maxlen, argc; int i, maxlen, argc;
char *buffer; char *buffer;

4
compat/mingw.h
View File

@ -532,8 +532,8 @@ extern CRITICAL_SECTION pinfo_cs;
* A replacement of main() that adds win32 specific initialization. * A replacement of main() that adds win32 specific initialization.
*/ */
void mingw_startup(); void mingw_startup(void);
#define main(c,v) dummy_decl_mingw_main(); \ #define main(c,v) dummy_decl_mingw_main(void); \
static int mingw_main(c,v); \ static int mingw_main(c,v); \
int main(int argc, char **argv) \ int main(int argc, char **argv) \
{ \ { \

2
compat/winansi.c
View File

@ -492,7 +492,7 @@ static inline ioinfo* _pioinfo(int fd)
(fd & (IOINFO_ARRAY_ELTS - 1)) * sizeof_ioinfo); (fd & (IOINFO_ARRAY_ELTS - 1)) * sizeof_ioinfo);
} }
static int init_sizeof_ioinfo() static int init_sizeof_ioinfo(void)
{ {
int istty, wastty; int istty, wastty;
/* don't init twice */ /* don't init twice */