diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-09-29 09:16:23 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-09-29 09:16:23 +0000 |
| commit | 3c3b1816d84a43ec45e3a5dcdc5ddf03d6b8c500 (patch) | |
| tree | 3ee65b983f0c5d9ac69c71bb4d494de0e0728dcc /winsup/mingw | |
| parent | 37048d3df7cbd1264ae74c4cdfb996f6f19b83a2 (diff) | |
| download | cygnal-3c3b1816d84a43ec45e3a5dcdc5ddf03d6b8c500.tar.gz cygnal-3c3b1816d84a43ec45e3a5dcdc5ddf03d6b8c500.tar.bz2 cygnal-3c3b1816d84a43ec45e3a5dcdc5ddf03d6b8c500.zip | |
* include/stdlib.h: Guard non-ISO functions with
!__STRICT_ANSI__, throughout.
Diffstat (limited to 'winsup/mingw')
| -rw-r--r-- | winsup/mingw/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/mingw/include/stdlib.h | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 426f3e862..212a47c7b 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,8 @@ +2003-09-29 Danny Smith <dannysmith@users.sourceforge.net> + + * include/stdlib.h: Guard non-ISO functions with + !__STRICT_ANSI__, throughout. + 2003-09-24 Danny Smith <dannysmith@users.sourceforge.net> * include/io.h (_fileno): Remove prototype. diff --git a/winsup/mingw/include/stdlib.h b/winsup/mingw/include/stdlib.h index 23389c2c1..901a10ece 100644 --- a/winsup/mingw/include/stdlib.h +++ b/winsup/mingw/include/stdlib.h @@ -77,6 +77,8 @@ extern "C" { #endif +#if !defined (__STRICT_ANSI__) + /* * This seems like a convenient place to declare these variables, which * give programs using WinMain (or main for that matter) access to main-ish @@ -116,7 +118,7 @@ __MINGW_IMPORT char** __argv_dll; #endif /* __DECLSPEC_SUPPORTED */ #endif /* __MSVCRT */ - +#endif /* __STRICT_ANSI__ */ /* * Also defined in ctype.h. */ @@ -155,6 +157,7 @@ extern int errno; _CRTIMP int* __cdecl __doserrno(void); #define _doserrno (*__doserrno()) +#if !defined (__STRICT_ANSI__) /* * Use environ from the DLL, not as a global. */ @@ -216,7 +219,6 @@ __MINGW_IMPORT char* _sys_errlist[]; /* * OS version and such constants. */ -#ifndef __STRICT_ANSI__ #ifdef __MSVCRT__ /* msvcrtxx.dll */ @@ -324,9 +326,10 @@ __MINGW_IMPORT int _fmode_dll; _CRTIMP double __cdecl atof (const char*); _CRTIMP int __cdecl atoi (const char*); _CRTIMP long __cdecl atol (const char*); +#if !defined (__STRICT_ANSI__) _CRTIMP int __cdecl _wtoi (const wchar_t *); _CRTIMP long __cdecl _wtol (const wchar_t *); - +#endif _CRTIMP double __cdecl strtod (const char*, char**); #if !defined __NO_ISOCEXT /* extern stub in static libmingwex.a */ __CRT_INLINE float __cdecl strtof (const char *nptr, char **endptr) @@ -398,7 +401,7 @@ typedef struct { long quot, rem; } ldiv_t; _CRTIMP div_t __cdecl div (int, int); _CRTIMP ldiv_t __cdecl ldiv (long, long); -#ifndef __STRICT_ANSI__ +#if !defined (__STRICT_ANSI__) /* * NOTE: Officially the three following functions are obsolete. The Win32 API |