diff options
Diffstat (limited to 'nt/inc/ms-w32.h')
| -rw-r--r-- | nt/inc/ms-w32.h | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index e5d9fd3e78e..4cbae16dc5a 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -300,22 +300,6 @@ extern int sys_umask (int); #define execvp _execvp #include <stdint.h> /* for intptr_t */ extern intptr_t _execvp (const char *, char **); -#ifdef MINGW_W64 -/* GCC 6 has a builtin execve with the prototype shown below. MinGW64 - changed the prototype in its process.h to match that, although the - library function still calls _execve, which still returns intptr_t. - However, using the prototype with intptr_t causes GCC to emit - warnings. Fortunately, execve is not used in the MinGW build, but - the code that references it is still compiled. */ -extern int execve (const char *, char * const *, char * const *); -#else -/* mingw.org's MinGW GCC 9.x has the same built-in prototype... */ -# if __GNUC__ >= 9 -extern int execve (const char *, char * const *, char * const *); -# else -extern intptr_t execve (const char *, char * const *, char * const *); -# endif -#endif #define tcdrain _commit #define fdopen _fdopen #define fsync _commit @@ -445,6 +429,7 @@ extern int alarm (int); extern int sys_kill (pid_t, int); +extern void explicit_bzero (void *, size_t); /* For integration with MSDOS support. */ #define getdisk() (_getdrive () - 1) @@ -504,6 +489,8 @@ extern void *malloc_after_dump_9x(size_t); extern void *realloc_after_dump_9x(void *, size_t); extern void free_after_dump_9x(void *); +extern void *sys_calloc(size_t, size_t); + extern malloc_fn the_malloc_fn; extern realloc_fn the_realloc_fn; extern free_fn the_free_fn; @@ -511,6 +498,7 @@ extern free_fn the_free_fn; #define malloc(size) (*the_malloc_fn)(size) #define free(ptr) (*the_free_fn)(ptr) #define realloc(ptr, size) (*the_realloc_fn)(ptr, size) +#define calloc(num, size) sys_calloc(num, size) #endif |