Commit 5e99fc1b authored by Ben Avison's avatar Ben Avison
Browse files

Compatible with cc 5.45.

Detail:
  Two problems: first, in machine/types.h, stdint.h was included unless
  KERNEL was defined; doing this triggers a #error unless you're working in
  C99 mode (eg rpclib and socklib, which are compiled in PCC mode).
  Second, sys/types.h tries to define its own 64-bit struct types, with names
  that clash with C99's own 64-bit types. Both are fixed by wrapping them in
  checks on the value of __STDC_VERSION__, and then only including and using
  stdint.h if the compiler is in C99 mode. Unfortunately this does generate
  warnings in PCC mode because __STDC_VERSION__ is undefined.
Admin:
  Builds, but not extensively tested.

Version 5.43. Tagged as 'TCPIPLibs-5_43'
parent cc73ae03
/* (5.42)
/* (5.43)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.62.
* Last processed by srccommit version: 1.64.
*
*/
#define Module_MajorVersion_CMHG 5.42
#define Module_MajorVersion_CMHG 5.43
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Mar 2002
#define Module_Date_CMHG 29 May 2002
#define Module_MajorVersion "5.42"
#define Module_Version 542
#define Module_MajorVersion "5.43"
#define Module_Version 543
#define Module_MinorVersion ""
#define Module_Date "21 Mar 2002"
#define Module_Date "29 May 2002"
#define Module_ApplicationDate2 "21-Mar-02"
#define Module_ApplicationDate4 "21-Mar-2002"
#define Module_ApplicationDate2 "29-May-02"
#define Module_ApplicationDate4 "29-May-2002"
#define Module_ComponentName "TCPIPLibs"
#define Module_ComponentPath "RiscOS/Sources/Lib/TCPIPLibs"
#define Module_FullVersion "5.42"
#define Module_HelpVersion "5.42 (21 Mar 2002)"
#define Module_LibraryVersionInfo "5:42"
#define Module_FullVersion "5.43"
#define Module_HelpVersion "5.43 (29 May 2002)"
#define Module_LibraryVersionInfo "5:43"
......@@ -28,16 +28,20 @@
#define _BSD_SSIZE_T_ int
typedef unsigned int vm_offset_t;
#if !defined(KERNEL) && __STDC_VERSION__ >= 199901
#include <stdint.h>
typedef uint32_t u_int32_t;
typedef uint16_t u_int16_t;
#else
#ifdef KERNEL
typedef unsigned long u_int32_t;
typedef unsigned short u_int16_t;
typedef long int32_t;
typedef short int16_t;
#else
#include <stdint.h>
typedef uint32_t u_int32_t;
typedef uint16_t u_int16_t;
typedef unsigned int u_int32_t;
typedef int int32_t;
#endif
typedef unsigned short u_int16_t;
typedef short int16_t;
#endif
#endif
......@@ -70,6 +70,10 @@ typedef unsigned long u_quad_t; /* quads */
typedef long quad_t;
typedef quad_t * qaddr_t;
#if __STDC_VERSION__ >= 199901
#include <stdint.h>
typedef uint64_t u_int64_t;
#else
/* sbrodie added these for NFSv3 support */
typedef struct _int64_t {
unsigned long low;
......@@ -80,6 +84,7 @@ typedef struct _u_int64_t {
unsigned long high;
} u_int64_t;
#endif
#endif
typedef char * caddr_t; /* core address */
typedef long daddr_t; /* disk address */
......
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