Commit 83945ac3 authored by Ben Avison's avatar Ben Avison
Browse files

Unbreak stdio.h for C90 mode

Detail:
  Large file support made use of long longs in various definitions. These
  were switched out in PCC mode, but no allowances were made for the fact
  that C90 doesn't define long long either.
  Remember that to force cc to use non-builtin standard headers, you need
  to point at these using the -j switch (e.g. -jC:). The only version of
  cc which featured the C90-incompatible stdio.h was 5.70.
Admin:
  Checked that the header now works when included in -pcc, -c90 and -c99 modes.

Version 5.81. Tagged as 'RISC_OSLib-5_81'
parent 76d1dff4
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.80"
Module_Version SETA 580
Module_MajorVersion SETS "5.81"
Module_Version SETA 581
Module_MinorVersion SETS ""
Module_Date SETS "21 Jan 2014"
Module_ApplicationDate SETS "21-Jan-14"
Module_Date SETS "25 Mar 2014"
Module_ApplicationDate SETS "25-Mar-14"
Module_ComponentName SETS "RISC_OSLib"
Module_ComponentPath SETS "castle/RiscOS/Sources/Lib/RISC_OSLib"
Module_FullVersion SETS "5.80"
Module_HelpVersion SETS "5.80 (21 Jan 2014)"
Module_FullVersion SETS "5.81"
Module_HelpVersion SETS "5.81 (25 Mar 2014)"
END
/* (5.80)
/* (5.81)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.80
#define Module_MajorVersion_CMHG 5.81
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Jan 2014
#define Module_Date_CMHG 25 Mar 2014
#define Module_MajorVersion "5.80"
#define Module_Version 580
#define Module_MajorVersion "5.81"
#define Module_Version 581
#define Module_MinorVersion ""
#define Module_Date "21 Jan 2014"
#define Module_Date "25 Mar 2014"
#define Module_ApplicationDate "21-Jan-14"
#define Module_ApplicationDate "25-Mar-14"
#define Module_ComponentName "RISC_OSLib"
#define Module_ComponentPath "castle/RiscOS/Sources/Lib/RISC_OSLib"
#define Module_FullVersion "5.80"
#define Module_HelpVersion "5.80 (21 Jan 2014)"
#define Module_LibraryVersionInfo "5:80"
#define Module_FullVersion "5.81"
#define Module_HelpVersion "5.81 (25 Mar 2014)"
#define Module_LibraryVersionInfo "5:81"
......@@ -45,14 +45,14 @@ typedef char *__va_list[1]; /* keep in step with <stdarg.h> */
#endif
typedef long int _off_t;
#ifdef __STDC__
#if __STDC_VERSION__ >= 199901
typedef long long int _off64_t;
#endif
#ifndef _FILE_OFFSET_BITS
#define _FILE_OFFSET_BITS 32
#endif
#if defined(__STDC__) && _FILE_OFFSET_BITS == 64
#if __STDC_VERSION__ >= 199901 && _FILE_OFFSET_BITS == 64
typedef _off64_t fpos_t;
#elif _FILE_OFFSET_BITS == 32
typedef _off_t fpos_t;
......@@ -73,11 +73,11 @@ typedef fpos_t off_t;
* the LFS extension functions fseeko() and fello().
*/
#if defined(__STDC__) && defined(_LARGEFILE64_SOURCE)
#if __STDC_VERSION__ >= 199901 && defined(_LARGEFILE64_SOURCE)
typedef _off64_t fpos64_t, off64_t;
#endif
/*
* fpos64_t and of64_t are the equivalent of fpos_t and off_t respectively,
* fpos64_t and off64_t are the equivalent of fpos_t and off_t respectively,
* and are used in their place when an application explicitly uses the
* 64-bit LFS extension functions fgetpo64(), fseeko64(), fsetpos64() and
* ftello64().
......@@ -203,7 +203,7 @@ int rename(const char * /*old*/, const char * /*new*/);
* original name.
*/
FILE *tmpfile(void);
#ifdef __STDC__
#if __STDC_VERSION__ >= 199901
FILE *_tmpfile64(void);
#if _FILE_OFFSET_BITS == 64
#define tmpfile _tmpfile64
......@@ -262,7 +262,7 @@ int fflush(FILE * /*stream*/);
*/
FILE *fopen(const char * restrict /*filename*/,
const char * restrict /*mode*/);
#ifdef __STDC__
#if __STDC_VERSION__ >= 199901
FILE *_fopen64(const char * restrict /*filename*/,
const char * restrict /*mode*/);
#if _FILE_OFFSET_BITS == 64
......@@ -317,7 +317,7 @@ FILE *_fopen64(const char * restrict /*filename*/,
FILE *freopen(const char * restrict /*filename*/,
const char * restrict /*mode*/,
FILE * restrict /*stream*/);
#ifdef __STDC__
#if __STDC_VERSION__ >= 199901
FILE *_freopen64(const char * restrict /*filename*/,
const char * restrict /*mode*/,
FILE * restrict /*stream*/);
......@@ -721,7 +721,7 @@ size_t fwrite(const void * restrict /*ptr*/,
*/
int fgetpos(FILE * restrict /*stream*/, _off_t * restrict /*pos*/);
#ifdef __STDC__
#if __STDC_VERSION__ >= 199901
int _fgetpos64(FILE * restrict /*stream*/, _off64_t * restrict /*pos*/);
#if _FILE_OFFSET_BITS == 64
#define fgetpos _fgetpos64
......@@ -749,7 +749,7 @@ int _fseeko(FILE * /*stream*/, _off_t /*offset*/, int /*whence*/);
#define fseeko _fseeko
#endif
#endif
#ifdef __STDC__
#if __STDC_VERSION__ >= 199901
int _fseeko64(FILE * /*stream*/, _off64_t /*offset*/, int /*whence*/);
#ifdef _LARGEFILE64_SOURCE
#define fseeko64 _fseeko64
......@@ -772,7 +772,7 @@ int _fseeko64(FILE * /*stream*/, _off64_t /*offset*/, int /*whence*/);
* Returns: nonzero only for a request that cannot be satisfied.
*/
int fsetpos(FILE * /*stream*/, const _off_t * /*pos*/);
#ifdef __STDC__
#if __STDC_VERSION__ >= 199901
int _fsetpos64(FILE * /*stream*/, const _off64_t * /*pos*/);
#if _FILE_OFFSET_BITS == 64
#define fsetpos _fsetpos64
......@@ -803,7 +803,7 @@ _off_t _ftello(FILE * /*stream*/);
#define ftello _ftello
#endif
#endif
#ifdef __STDC__
#if __STDC_VERSION__ >= 199901
_off64_t _ftello64(FILE * /*stream*/);
#ifdef _LARGEFILE64_SOURCE
#define ftello64 _ftello64
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment