diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-12-14 00:22:34 +0300 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-12-14 00:22:34 +0300 |
| commit | f082663050af4062e8fea5e3f56991794dcb0091 (patch) | |
| tree | 88039cfb9c3a00862c99f21d6370ff94eff2175c | |
| parent | 9279515ae13bbaae37a1d9e8fc4beef0b7d77add (diff) | |
* 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.
| -rw-r--r-- | winsup/mingw/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/mingw/include/stdio.h | 13 | ||||
| -rw-r--r-- | winsup/mingw/moldname.def.in | 1 |
3 files changed, 18 insertions, 4 deletions
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 <dannysmith@users.sourceforge.net> + + * 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 <aafemt@users.sourceforge.net> * 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,17 +384,17 @@ _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*); +#endif /* Not _NO_OLDNAMES */ +#define _fileno(__F) ((__F)->_file) +#ifndef _NO_OLDNAMES #define fileno(__F) ((__F)->_file) - -#endif /* Not _NO_OLDNAMES */ +#endif #endif /* Not __STRICT_ANSI__ */ 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 |