diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 20:38:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 20:38:14 (GMT) |
| commit | fd4df42275b73bdcd938a833053b514125f3f9a3 (patch) | |
| tree | f9fd547ca1362126ec9415160a0ee3aaefecfeda /compat | |
| parent | 5854b36c4ad53b54954abf738514bf8ae8ad53cc (diff) | |
| parent | 0767172b9068b225c06fd7ce66422e5936ec60a2 (diff) | |
| download | git-fd4df42275b73bdcd938a833053b514125f3f9a3.zip git-fd4df42275b73bdcd938a833053b514125f3f9a3.tar.gz git-fd4df42275b73bdcd938a833053b514125f3f9a3.tar.bz2 | |
Merge branch 'js/mingw-parameter-less-c-functions'
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
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/mingw.c | 6 | ||||
| -rw-r--r-- | compat/mingw.h | 4 | ||||
| -rw-r--r-- | compat/winansi.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index a8218e6..2b5467d 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -2162,7 +2162,7 @@ int xwcstoutf(char *utf, const wchar_t *wcs, size_t utflen) return -1; } -static void setup_windows_environment() +static void setup_windows_environment(void) { char *tmp = getenv("TMPDIR"); @@ -2204,7 +2204,7 @@ typedef struct { extern int __wgetmainargs(int *argc, wchar_t ***argv, wchar_t ***env, int glob, _startupinfo *si); -static NORETURN void die_startup() +static NORETURN void die_startup(void) { fputs("fatal: not enough memory for initialization", stderr); 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); } -void mingw_startup() +void mingw_startup(void) { int i, maxlen, argc; char *buffer; diff --git a/compat/mingw.h b/compat/mingw.h index 69bb43d..9a8803b 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -532,8 +532,8 @@ extern CRITICAL_SECTION pinfo_cs; * A replacement of main() that adds win32 specific initialization. */ -void mingw_startup(); -#define main(c,v) dummy_decl_mingw_main(); \ +void mingw_startup(void); +#define main(c,v) dummy_decl_mingw_main(void); \ static int mingw_main(c,v); \ int main(int argc, char **argv) \ { \ diff --git a/compat/winansi.c b/compat/winansi.c index 3be60ce..db4a5b0 100644 --- a/compat/winansi.c +++ b/compat/winansi.c @@ -492,7 +492,7 @@ static inline ioinfo* _pioinfo(int fd) (fd & (IOINFO_ARRAY_ELTS - 1)) * sizeof_ioinfo); } -static int init_sizeof_ioinfo() +static int init_sizeof_ioinfo(void) { int istty, wastty; /* don't init twice */ |