diff options
| -rw-r--r-- | winsup/mingw/ChangeLog | 16 | ||||
| -rw-r--r-- | winsup/mingw/include/process.h | 73 | ||||
| -rw-r--r-- | winsup/mingw/include/wchar.h | 38 |
3 files changed, 72 insertions, 55 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 217dcea6f..7b4757abc 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,5 +1,21 @@ 2008-04-25 Danny Smith <dannysmith@users.sourceforge.net> + * include/process.h: Include stdint.h for intptr_t definition. + (_execl, _execle, _execlp, _execlpe, _execv, _execve, _execvp, _execvpe, + _spawnl, _spawnle, _spawnlp, _spawnlpe, _spawnv, _spawnve, _spawnvp, + _spawnvpe): Return intptr_t. + (execl, execle, execlp, execlpe, execv, execve, execvp, execvpe, spawnl, + spawnle, spawnlp, spawnlpe, spawnv, spawnve, spawnvp, spawnvpe): Return + intptr_t. + * include/wchar.h: Guard wide process.h functions with !__STRICT_ANSI__. + + [!_WPROCESS_DEFINED]: Include stdint.h for intptr_t definition. + (_wexecl, _wexecle, _wexeclp, _wexeclpe, _wexecv, _wexecve, _wexecvp, + _wexecvpe, _wspawnl, _wspawnle, _wspawnlp, _wspawnlpe, _wspawnv, _wspawnve, + _wspawnvp, _wspawnvpe): Return intptr_t. + +2008-04-25 Danny Smith <dannysmith@users.sourceforge.net> + * include/wchar.h (fwide): Return success code rather than failure in inline definition. * mingwex/fwide.c (fwide): ANSI-fy. Get rid of Q8 comments. Return success diff --git a/winsup/mingw/include/process.h b/winsup/mingw/include/process.h index 5af1fcc9a..c0c380fbd 100644 --- a/winsup/mingw/include/process.h +++ b/winsup/mingw/include/process.h @@ -14,9 +14,8 @@ /* All the headers include this file. */ #include <_mingw.h> -/* Includes a definition of _pid_t and pid_t */ -#include <sys/types.h> - +#include <sys/types.h> /* For _pid_t and pid_t. */ +#include <stdint.h> /* For intptr_t. */ /* * Constants for cwait actions. * Obsolete for Win32. @@ -62,23 +61,23 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _cwait (int*, _pid_t, int); _CRTIMP _pid_t __cdecl __MINGW_NOTHROW _getpid(void); -_CRTIMP int __cdecl __MINGW_NOTHROW _execl (const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _execle (const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _execlp (const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _execlpe (const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _execv (const char*, const char* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW _execve (const char*, const char* const*, const char* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW _execvp (const char*, const char* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW _execvpe (const char*, const char* const*, const char* const*); - -_CRTIMP int __cdecl __MINGW_NOTHROW _spawnl (int, const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _spawnle (int, const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _spawnlp (int, const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _spawnlpe (int, const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _spawnv (int, const char*, const char* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW _spawnve (int, const char*, const char* const*, const char* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW _spawnvp (int, const char*, const char* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW _spawnvpe (int, const char*, const char* const*, const char* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _execl (const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _execle (const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _execlp (const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _execlpe (const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _execv (const char*, const char* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _execve (const char*, const char* const*, const char* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _execvp (const char*, const char* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _execvpe (const char*, const char* const*, const char* const*); + +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _spawnl (int, const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _spawnle (int, const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _spawnlp (int, const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _spawnlpe (int, const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _spawnv (int, const char*, const char* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _spawnve (int, const char*, const char* const*, const char* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _spawnvp (int, const char*, const char* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _spawnvpe (int, const char*, const char* const*, const char* const*); /* @@ -111,22 +110,24 @@ _CRTIMP void __cdecl __MINGW_NOTHROW _endthreadex (unsigned); */ _CRTIMP int __cdecl __MINGW_NOTHROW cwait (int*, pid_t, int); _CRTIMP pid_t __cdecl __MINGW_NOTHROW getpid (void); -_CRTIMP int __cdecl __MINGW_NOTHROW execl (const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW execle (const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW execlp (const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW execlpe (const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW execv (const char*, const char* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW execve (const char*, const char* const*, const char* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW execvp (const char*, const char* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW execvpe (const char*, const char* const*, const char* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW spawnl (int, const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW spawnle (int, const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW spawnlp (int, const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW spawnlpe (int, const char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW spawnv (int, const char*, const char* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW spawnve (int, const char*, const char* const*, const char* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW spawnvp (int, const char*, const char* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW spawnvpe (int, const char*, const char* const*, const char* const*); + +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW execl (const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW execle (const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW execlp (const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW execlpe (const char*, const char*,...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW execv (const char*, const char* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW execve (const char*, const char* const*, const char* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW execvp (const char*, const char* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW execvpe (const char*, const char* const*, const char* const*); + +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW spawnl (int, const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW spawnle (int, const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW spawnlp (int, const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW spawnlpe (int, const char*, const char*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW spawnv (int, const char*, const char* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW spawnve (int, const char*, const char* const*, const char* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW spawnvp (int, const char*, const char* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW spawnvpe (int, const char*, const char* const*, const char* const*); #endif /* Not _NO_OLDNAMES */ #ifdef __cplusplus diff --git a/winsup/mingw/include/wchar.h b/winsup/mingw/include/wchar.h index 1d3181f75..9109c5e27 100644 --- a/winsup/mingw/include/wchar.h +++ b/winsup/mingw/include/wchar.h @@ -480,29 +480,29 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wsetlocale (int, const wchar_t*); #define _WLOCALE_DEFINED #endif -#endif /* not __STRICT_ANSI__ */ - #ifndef _WPROCESS_DEFINED /* also declared in process.h */ -_CRTIMP int __cdecl __MINGW_NOTHROW _wexecl (const wchar_t*, const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _wexecle (const wchar_t*, const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _wexeclp (const wchar_t*, const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _wexeclpe (const wchar_t*, const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _wexecv (const wchar_t*, const wchar_t* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wexecve (const wchar_t*, const wchar_t* const*, const wchar_t* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wexecvp (const wchar_t*, const wchar_t* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wexecvpe (const wchar_t*, const wchar_t* const*, const wchar_t* const*); - -_CRTIMP int __cdecl __MINGW_NOTHROW _wspawnl (int, const wchar_t*, const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _wspawnle (int, const wchar_t*, const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _wspawnlp (int, const wchar_t*, const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _wspawnlpe (int, const wchar_t*, const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _wspawnv (int, const wchar_t*, const wchar_t* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wspawnve (int, const wchar_t*, const wchar_t* const*, const wchar_t* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wspawnvp (int, const wchar_t*, const wchar_t* const*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wspawnvpe (int, const wchar_t*, const wchar_t* const*, const wchar_t* const*); +#include <stdint.h> /* For intptr_t. */ +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wexecl (const wchar_t*, const wchar_t*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wexecle (const wchar_t*, const wchar_t*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wexeclp (const wchar_t*, const wchar_t*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wexeclpe (const wchar_t*, const wchar_t*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wexecv (const wchar_t*, const wchar_t* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wexecve (const wchar_t*, const wchar_t* const*, const wchar_t* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wexecvp (const wchar_t*, const wchar_t* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wexecvpe (const wchar_t*, const wchar_t* const*, const wchar_t* const*); + +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnl (int, const wchar_t*, const wchar_t*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnle (int, const wchar_t*, const wchar_t*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnlp (int, const wchar_t*, const wchar_t*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnlpe (int, const wchar_t*, const wchar_t*, ...); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnv (int, const wchar_t*, const wchar_t* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnve (int, const wchar_t*, const wchar_t* const*, const wchar_t* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnvp (int, const wchar_t*, const wchar_t* const*); +_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnvpe (int, const wchar_t*, const wchar_t* const*, const wchar_t* const*); #define _WPROCESS_DEFINED #endif +#endif /* not __STRICT_ANSI__ */ #ifdef __cplusplus } /* end of extern "C" */ |