diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 4a3ba469f..4682a1eb8 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,11 @@ +2003-12-13 Danny Smith + + * include/stdio.h:(_fileno): Define macro version after both + fileno and _fileno functions declared. + + * include/stdio.h (_rmtmp, rmtmp): Add prototypes. + * moldnames.def.in (rmtmp) Add stub. + 2003-11-27 Dimitry Sibiryakov * include/signal.h (SIG_SGE, SIG_ACK): Add defines. diff --git a/winsup/mingw/include/stdio.h b/winsup/mingw/include/stdio.h index 8b7b0dd82..43c4f991f 100644 --- a/winsup/mingw/include/stdio.h +++ b/winsup/mingw/include/stdio.h @@ -197,11 +197,16 @@ _CRTIMP int __cdecl remove (const char*); _CRTIMP int __cdecl rename (const char*, const char*); _CRTIMP FILE* __cdecl tmpfile (void); _CRTIMP char* __cdecl tmpnam (char*); + +#ifndef __STRICT_ANSI__ _CRTIMP char* __cdecl _tempnam (const char*, const char*); +_CRTIMP int __cdecl _rmtmp(void); #ifndef NO_OLDNAMES _CRTIMP char* __cdecl tempnam (const char*, const char*); +_CRTIMP int __cdecl rmtmp(void); #endif +#endif /* __STRICT_ANSI__ */ _CRTIMP int __cdecl setvbuf (FILE*, char*, int, size_t); @@ -379,18 +384,18 @@ _CRTIMP int __cdecl _getmaxstdio(void); _CRTIMP int __cdecl _setmaxstdio(int); #endif -#define _fileno(__F) ((__F)->_file) - #ifndef _NO_OLDNAMES _CRTIMP int __cdecl fgetchar (void); _CRTIMP int __cdecl fputchar (int); _CRTIMP FILE* __cdecl fdopen (int, const char*); _CRTIMP int __cdecl fileno (FILE*); - -#define fileno(__F) ((__F)->_file) - #endif /* Not _NO_OLDNAMES */ +#define _fileno(__F) ((__F)->_file) +#ifndef _NO_OLDNAMES +#define fileno(__F) ((__F)->_file) +#endif + #endif /* Not __STRICT_ANSI__ */ /* Wide versions */ diff --git a/winsup/mingw/moldname.def.in b/winsup/mingw/moldname.def.in index 9e68ac517..8066275da 100644 --- a/winsup/mingw/moldname.def.in +++ b/winsup/mingw/moldname.def.in @@ -85,6 +85,7 @@ putenv putw read rmdir +rmtmp searchenv seterrormode setmode