updated mud.h (thanks to Donald Arseneau). Makes modern compiler happy again.
This commit is contained in:
parent
e38fa47961
commit
6e60013037
24
src/external/mud/src/mud.h
vendored
24
src/external/mud/src/mud.h
vendored
@ -4,7 +4,7 @@
|
|||||||
* mud.h Declarations for MUD
|
* mud.h Declarations for MUD
|
||||||
* v1.3
|
* v1.3
|
||||||
*
|
*
|
||||||
* Copyright (C) 1994-2025 TRIUMF (Vancouver, Canada)
|
* Copyright (C) 1994-2021 TRIUMF (Vancouver, Canada)
|
||||||
*
|
*
|
||||||
* Authors: T. Whidden, D. Arseneau, S. Daviel
|
* Authors: T. Whidden, D. Arseneau, S. Daviel
|
||||||
*
|
*
|
||||||
@ -25,14 +25,13 @@
|
|||||||
* 25-Nov-2009 DJA 64-bit linux
|
* 25-Nov-2009 DJA 64-bit linux
|
||||||
* 25-Jun-2017 DJA Allow use in C++ (ROOT); shared lib.
|
* 25-Jun-2017 DJA Allow use in C++ (ROOT); shared lib.
|
||||||
* 14-Aug-2019 DJA Use stdint.h, casts in printf
|
* 14-Aug-2019 DJA Use stdint.h, casts in printf
|
||||||
|
* 01-Jun-2021 DJA Add arm64 arch as little-endian
|
||||||
|
* 26-Aug-2021 DJA Declare caddr_t in all Win.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
#ifdef __CINT__
|
|
||||||
typedef char* caddr_t;
|
|
||||||
#endif /* __CINT __ */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* FORMAT IDs - Must be unique!
|
* FORMAT IDs - Must be unique!
|
||||||
@ -133,7 +132,7 @@ typedef int32_t INT32;
|
|||||||
typedef uint32_t UINT32;
|
typedef uint32_t UINT32;
|
||||||
typedef float REAL32;
|
typedef float REAL32;
|
||||||
typedef double REAL64;
|
typedef double REAL64;
|
||||||
#else /*no stding.h */
|
#else /*no stdint.h */
|
||||||
typedef int STATUS;
|
typedef int STATUS;
|
||||||
typedef char INT8;
|
typedef char INT8;
|
||||||
typedef unsigned char UINT8;
|
typedef unsigned char UINT8;
|
||||||
@ -145,13 +144,13 @@ typedef unsigned int UINT32;
|
|||||||
#else
|
#else
|
||||||
typedef long INT32;
|
typedef long INT32;
|
||||||
typedef unsigned long UINT32;
|
typedef unsigned long UINT32;
|
||||||
#endif /* __alpha || __linux || __MACH__*/
|
#endif /* __alpha || __linux || __MACH__ || __arm64 */
|
||||||
typedef float REAL32;
|
typedef float REAL32;
|
||||||
typedef double REAL64;
|
typedef double REAL64;
|
||||||
#if (defined(__alpha)&&defined(vms)) || defined(__BORLANDC__) || defined(__TURBOC__)
|
#endif /* _STDINT_H */
|
||||||
|
#if (defined(__alpha)&&defined(vms)) || defined( __CINT__ ) || defined(_WIN32)
|
||||||
typedef char* caddr_t;
|
typedef char* caddr_t;
|
||||||
#endif
|
#endif
|
||||||
#endif /* _STDINT_HNOSTDINT */
|
|
||||||
typedef UINT32 TIME;
|
typedef UINT32 TIME;
|
||||||
#ifndef BOOL_DEFINED
|
#ifndef BOOL_DEFINED
|
||||||
#define BOOL_DEFINED
|
#define BOOL_DEFINED
|
||||||
@ -184,10 +183,10 @@ typedef UINT32 BOOL;
|
|||||||
/*
|
/*
|
||||||
* c_utils.h, Defines for C utilities
|
* c_utils.h, Defines for C utilities
|
||||||
*/
|
*/
|
||||||
#if defined(vms) || defined(__MSDOS__)
|
#if defined(vms) || defined(__MSDOS__) || defined(_WIN32)
|
||||||
#define bcopy( b1, b2, len ) memcpy(b2,b1,len)
|
#define bcopy( b1, b2, len ) memcpy(b2,b1,len)
|
||||||
#define bzero( b, len ) memset(b,(char)0,len)
|
#define bzero( b, len ) memset(b,(char)0,len)
|
||||||
#endif /* vms || __MSDOS__ */
|
#endif /* vms || __MSDOS__ || _WIN32 */
|
||||||
#ifndef _C_UTILS_H_ /* conflict with c_utils.h */
|
#ifndef _C_UTILS_H_ /* conflict with c_utils.h */
|
||||||
#define _max( a, b ) ( ( (a) > (b) ) ? (a) : (b) )
|
#define _max( a, b ) ( ( (a) > (b) ) ? (a) : (b) )
|
||||||
#define _min( a, b ) ( ( (a) < (b) ) ? (a) : (b) )
|
#define _min( a, b ) ( ( (a) < (b) ) ? (a) : (b) )
|
||||||
@ -204,7 +203,6 @@ typedef UINT32 BOOL;
|
|||||||
#define strdup( s ) strcpy((char*)malloc(strlen(s)+1),s)
|
#define strdup( s ) strcpy((char*)malloc(strlen(s)+1),s)
|
||||||
#endif /* vms || mips&&!sgi */
|
#endif /* vms || mips&&!sgi */
|
||||||
/*#endif */
|
/*#endif */
|
||||||
typedef int (*MUD_PROC)();
|
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
MUD_ENCODE = 0,
|
MUD_ENCODE = 0,
|
||||||
@ -215,6 +213,8 @@ typedef enum {
|
|||||||
MUD_HEADS = 5
|
MUD_HEADS = 5
|
||||||
} MUD_OPT;
|
} MUD_OPT;
|
||||||
|
|
||||||
|
typedef int (*MUD_PROC)(MUD_OPT, ...);
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
MUD_ONE = 1,
|
MUD_ONE = 1,
|
||||||
MUD_ALL = 2,
|
MUD_ALL = 2,
|
||||||
@ -427,7 +427,7 @@ typedef struct {
|
|||||||
#define MUD_instanceID( pM ) (((MUD_SEC*)pM)->core.instanceID)
|
#define MUD_instanceID( pM ) (((MUD_SEC*)pM)->core.instanceID)
|
||||||
|
|
||||||
|
|
||||||
#if defined(__MSDOS__) || defined(__i386__) || defined(__i586__) || defined(__i686__) || defined(vax) || defined(__alpha) || defined(__amd64) || defined(__arm64) || (defined(__mips)&&!defined(__sgi))
|
#if defined(__MSDOS__) || defined(_WIN32) || defined(__i386__) || defined(__i586__) || defined(__i686__) || defined(vax) || defined(__alpha) || defined(__amd64) || defined(__arm64) || (defined(__mips)&&!defined(__sgi))
|
||||||
#define MUD_LITTLE_ENDIAN 1
|
#define MUD_LITTLE_ENDIAN 1
|
||||||
#else
|
#else
|
||||||
#define MUD_BIG_ENDIAN 1
|
#define MUD_BIG_ENDIAN 1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user