JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* include/io.h (_fileno): Remove prototype.

Browse Source 
(fileno): Likewise.
	(FILENAME_MAX): Define, if needed.
	Don't include <stdio.h>.
	* include/stdio.h (FILENAME_MAX): Protect against
	prior definition.
	(_fileno): Define macro implementation.
	(fileno): Likewise.
This commit is contained in:
Danny Smith 2003-09-24 08:26:23 +00:00
parent d771730336
commit fd4b566a16
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
winsup/mingw/ChangeLog
View File

@ -1,3 +1,14 @@
2003-09-24 Danny Smith <dannysmith@users.sourceforge.net>
* include/io.h (_fileno): Remove prototype.
(fileno): Likewise.
(FILENAME_MAX): Define, if needed.
Don't include <stdio.h>.
* include/stdio.h (FILENAME_MAX): Protect against
prior definition.
(_fileno): Define macro implementation.
(fileno): Likewise.
2003-09-24 Danny Smith <dannysmith@users.sourceforge.net>
* include/inttypes.h: Include _mingw.h.

14
winsup/mingw/include/io.h
View File

@ -32,9 +32,6 @@
/* All the headers include this file. */
#include <_mingw.h>
/* We need the definition of FILE anyway... */
#include <stdio.h>
/* MSVC's io.h contains the stuff from dir.h, so I will too.
* NOTE: This also defines off_t, the file offset type, through
* an inclusion of sys/types.h */
@ -61,6 +58,15 @@ typedef unsigned long _fsize_t;
#define _FSIZE_T_DEFINED
#endif
/*
* The maximum length of a file name. You should use GetVolumeInformation
* instead of this constant. But hey, this works.
* Also defined in stdio.h.
*/
#ifndef FILENAME_MAX
#define FILENAME_MAX (260)
#endif
/*
* The following structure is filled in by _findfirst or _findnext when
* they succeed in finding a match.
@ -188,7 +194,6 @@ _CRTIMP int __cdecl _creat (const char*, int);
_CRTIMP int __cdecl _dup (int);
_CRTIMP int __cdecl _dup2 (int, int);
_CRTIMP long __cdecl _filelength (int);
_CRTIMP int __cdecl _fileno (FILE*);
_CRTIMP long __cdecl _get_osfhandle (int);
_CRTIMP int __cdecl _isatty (int);
@ -258,7 +263,6 @@ _CRTIMP int __cdecl dup (int);
_CRTIMP int __cdecl dup2 (int, int);
_CRTIMP int __cdecl eof (int);
_CRTIMP long __cdecl filelength (int);
_CRTIMP int __cdecl fileno (FILE*);
_CRTIMP int __cdecl isatty (int);
_CRTIMP long __cdecl lseek (int, long, int);
_CRTIMP int __cdecl open (const char*, int, ...);

11
winsup/mingw/include/stdio.h
View File

@ -65,11 +65,11 @@
/*
* The maximum length of a file name. You should use GetVolumeInformation
* instead of this constant. But hey, this works.
*
* NOTE: This is used in the structure _finddata_t (see io.h) so changing it
* is probably not a good idea.
* Also defined in io.h.
*/
#ifndef FILENAME_MAX
#define FILENAME_MAX (260)
#endif
/*
* The maximum number of files that may be open at once. I have set this to
@ -336,11 +336,16 @@ _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 */
#endif /* Not __STRICT_ANSI__ */