Commit 8e9a4e8e authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Build fix

s/h_brazil: use Hdr:System instead of GETting them one at a time
c/scanf: type cast

Version 5.77. Tagged as 'RISC_OSLib-5_77'
parent 7676d000
| Copyright 1996 Acorn Computers Ltd
|
| Licensed under the Apache License, Version 2.0 (the "License");
| you may not use this file except in compliance with the License.
| You may obtain a copy of the License at
|
| http://www.apache.org/licenses/LICENSE-2.0
|
| Unless required by applicable law or agreed to in writing, software
| distributed under the License is distributed on an "AS IS" BASIS,
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
| See the License for the specific language governing permissions and
| limitations under the License.
|
Dir <Obey$Dir>
wimpslot -min 1000k
echo amu_machine lib.clib
amu_machine lib.clib
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.76"
Module_Version SETA 576
Module_MajorVersion SETS "5.77"
Module_Version SETA 577
Module_MinorVersion SETS ""
Module_Date SETS "20 Mar 2013"
Module_ApplicationDate SETS "20-Mar-13"
Module_Date SETS "24 Mar 2013"
Module_ApplicationDate SETS "24-Mar-13"
Module_ComponentName SETS "RISC_OSLib"
Module_ComponentPath SETS "castle/RiscOS/Sources/Lib/RISC_OSLib"
Module_FullVersion SETS "5.76"
Module_HelpVersion SETS "5.76 (20 Mar 2013)"
Module_FullVersion SETS "5.77"
Module_HelpVersion SETS "5.77 (24 Mar 2013)"
END
/* (5.76)
/* (5.77)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.76
#define Module_MajorVersion_CMHG 5.77
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 20 Mar 2013
#define Module_Date_CMHG 24 Mar 2013
#define Module_MajorVersion "5.76"
#define Module_Version 576
#define Module_MajorVersion "5.77"
#define Module_Version 577
#define Module_MinorVersion ""
#define Module_Date "20 Mar 2013"
#define Module_Date "24 Mar 2013"
#define Module_ApplicationDate "20-Mar-13"
#define Module_ApplicationDate "24-Mar-13"
#define Module_ComponentName "RISC_OSLib"
#define Module_ComponentPath "castle/RiscOS/Sources/Lib/RISC_OSLib"
#define Module_FullVersion "5.76"
#define Module_HelpVersion "5.76 (20 Mar 2013)"
#define Module_LibraryVersionInfo "5:76"
#define Module_FullVersion "5.77"
#define Module_HelpVersion "5.77 (24 Mar 2013)"
#define Module_LibraryVersionInfo "5:77"
......@@ -638,7 +638,7 @@ static long int rd_string(FILE *p, va_list res, int flag, int field)
/* Can "%[blah]" match a zero-length string? No */
/* ISO9899 7.19.6.2 Matches a nonempty sequence of characters */
static long int rd_string_map(FILE *p, va_list res, int flag, int field,
int charmap[])
unsigned int charmap[])
{ long int charcount = -1; /* allow for always ungetc */
int ch; char *s = NULL;
if (!(flag & NOSTORE)) s = va_arg(res, char *);
......@@ -784,7 +784,8 @@ case '%': { int field = 0, flag = 0;
case 'x':
case 'X': worked = rd_int(p, argv, flag | ALLOWSIGN, 16, field);
break;
case '[': { int negated = 0, i, charmap[8];
case '[': { int negated = 0, i;
unsigned int charmap[8];
if ((fch = *fmt++) == '^') negated = 1, fch = *fmt++;
for (i=0; i<8; i++) charmap[i] = 0;
/* the 'do' next allows special treatment of %[]})] */
......
......@@ -26,11 +26,8 @@ LibraryVersionNumber * 6
GET Hdr:ListOpts
GET Hdr:Machine.<Machine>
GET Hdr:APCS.<APCS>
GET Hdr:CPU.Generic26
GET Hdr:CPU.Generic32
GET Hdr:Macros
GET Hdr:SWIs
GET Hdr:RISCOS
GET Hdr:System
GET Hdr:ModHand
GET Hdr:FPEmulator
......
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