Commit 98606082 authored by Ben Avison's avatar Ben Avison Committed by ROOL
Browse files

Tweak swis.h for older C standards

Prior to C18, you couldn't have duplicate typedefs (even if identical) so
if you `#include` both `<stdio.h>` and `"swis.h"` the `typedef __va_list`
conflicted if you specified `-c90` or `-c99`. (The header was already
incompatible with `-pcc`.)


Version 6.13. Not tagged
parent 0e8e4385
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
Module_MajorVersion SETS "6.13" Module_MajorVersion SETS "6.13"
Module_Version SETA 613 Module_Version SETA 613
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "15 Jun 2022" Module_Date SETS "16 Jun 2022"
Module_ApplicationDate SETS "15-Jun-22" Module_ApplicationDate SETS "16-Jun-22"
Module_ComponentName SETS "RISC_OSLib" Module_ComponentName SETS "RISC_OSLib"
Module_FullVersion SETS "6.13" Module_FullVersion SETS "6.13"
Module_HelpVersion SETS "6.13 (15 Jun 2022)" Module_HelpVersion SETS "6.13 (16 Jun 2022)"
END END
...@@ -5,17 +5,17 @@ ...@@ -5,17 +5,17 @@
*/ */
#define Module_MajorVersion_CMHG 6.13 #define Module_MajorVersion_CMHG 6.13
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 15 Jun 2022 #define Module_Date_CMHG 16 Jun 2022
#define Module_MajorVersion "6.13" #define Module_MajorVersion "6.13"
#define Module_Version 613 #define Module_Version 613
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "15 Jun 2022" #define Module_Date "16 Jun 2022"
#define Module_ApplicationDate "15-Jun-22" #define Module_ApplicationDate "16-Jun-22"
#define Module_ComponentName "RISC_OSLib" #define Module_ComponentName "RISC_OSLib"
#define Module_FullVersion "6.13" #define Module_FullVersion "6.13"
#define Module_HelpVersion "6.13 (15 Jun 2022)" #define Module_HelpVersion "6.13 (16 Jun 2022)"
#define Module_LibraryVersionInfo "6:13" #define Module_LibraryVersionInfo "6:13"
...@@ -34,7 +34,7 @@ extern "C" ...@@ -34,7 +34,7 @@ extern "C"
{ {
#endif #endif
typedef char *__va_list[1]; /* keep in step with <stdarg.h> */ typedef char *__va_listswi[1]; /* keep in step with <stdarg.h>, can't share __va_list pre-C18 */
#pragma -v4 #pragma -v4
extern int _swi (int swi_no, unsigned int, ...); extern int _swi (int swi_no, unsigned int, ...);
...@@ -42,9 +42,9 @@ extern int _swi (int swi_no, unsigned int, ...); ...@@ -42,9 +42,9 @@ extern int _swi (int swi_no, unsigned int, ...);
extern _kernel_oserror *_swix (int swi_no, unsigned int, ...); extern _kernel_oserror *_swix (int swi_no, unsigned int, ...);
#pragma -v0 #pragma -v0
extern int _vswi (int swi_no, unsigned int, __va_list); extern int _vswi (int swi_no, unsigned int, __va_listswi);
extern _kernel_oserror *_vswix (int swi_no, unsigned int, __va_list); extern _kernel_oserror *_vswix (int swi_no, unsigned int, __va_listswi);
#ifdef __cplusplus #ifdef __cplusplus
} }
......
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