rainlance
/
amath
mirror of https://gitlab.com/rnger/amath
1
0
Fork 0
Code Releases Wiki Activity

Cleanup and avoid OS conflicts (REQ #3)

This commit is contained in:
Carsten Sonne Larsen 2021-01-15 15:56:07 +01:00
parent ea2bf72d7b
commit d910b98571
1 changed files with 52 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
src/amath.h
View File

@ -29,104 +29,81 @@
#ifndef AMATH_H #ifndef AMATH_H
#define AMATH_H #define AMATH_H
/******************************************************************************/
#ifdef __AMIGA__ /* Operating System */
#if defined(__AMIGA__)
# define SYS_NAME "AmigaOS 3" # define SYS_NAME "AmigaOS 3"
# ifndef AOS3 # ifndef AOS3
# define AOS3 # define AOS3
# endif # endif
#endif #elif defined(__MORPHOS__)
/******************************************************************************/
#ifdef __AROS__
# define SYS_NAME "Aros"
# ifndef AROS
# define AROS
# endif
#endif
/******************************************************************************/
#ifdef __MORPHOS__
# define SYS_NAME "MorphOS" # define SYS_NAME "MorphOS"
# ifndef MORPHOS # ifndef MORPHOS
# define MORPHOS # define MORPHOS
# endif # endif
#endif #elif defined(__AROS__)
/******************************************************************************/ # define SYS_NAME "AROS"
#ifdef __amigaos4__ # ifndef AROS
# define AROS
# endif
#elif defined(__amigaos4__)
# define SYS_NAME "AmigaOS 4" # define SYS_NAME "AmigaOS 4"
# ifndef AOS4 # ifndef AOS4
# define AOS4 # define AOS4
# endif # endif
#endif #elif defined(__HAIKU__)
/******************************************************************************/
#ifdef __HAIKU__
# define SYS_NAME "Haiku" # define SYS_NAME "Haiku"
# ifndef HAIKU # ifndef HAIKU
# define HAIKU # define HAIKU
# endif # endif
#endif #elif defined(__APPLE__) && defined(__MACH__)
/******************************************************************************/
#ifdef __APPLE__
# define SYS_NAME "Apple" # define SYS_NAME "Apple"
# ifndef APPLE # ifndef APPLE
# define APPLE # define APPLE
# endif # endif
#endif #elif defined(__FreeBSD__)
/******************************************************************************/
#ifdef __FreeBSD__
# define SYS_NAME "FreeBSD" # define SYS_NAME "FreeBSD"
# ifndef FREEBSD # ifndef FREEBSD
# define FREEBSD # define FREEBSD
# endif # endif
#endif #elif defined(__NetBSD__)
/******************************************************************************/
#ifdef __NetBSD__
# define SYS_NAME "NetBSD" # define SYS_NAME "NetBSD"
# ifndef NETBSD # ifndef NETBSD
# define NETBSD # define NETBSD
# endif # endif
#endif #elif defined(__OpenBSD__)
/******************************************************************************/
#ifdef __OpenBSD__
# define SYS_NAME "OpenBSD" # define SYS_NAME "OpenBSD"
# ifndef OPENBSD # ifndef OPENBSD
# define OPENBSD # define OPENBSD
# endif # endif
#endif #elif defined(__DragonFly__)
/******************************************************************************/
#ifdef __DragonFly__
# define SYS_NAME "DragonFly BSD" # define SYS_NAME "DragonFly BSD"
# ifndef DRAGONFLY # ifndef DRAGONFLY
# define DRAGONFLY # define DRAGONFLY
# endif # endif
#endif #elif defined(__linux__)
/******************************************************************************/
#ifdef __linux__
# define SYS_NAME "Linux" # define SYS_NAME "Linux"
# ifndef LINUX # ifndef LINUX
# define LINUX # define LINUX
# endif # endif
#endif #elif defined(_WIN32)
/******************************************************************************/
#ifdef _WIN32
# define SYS_NAME "Windows" # define SYS_NAME "Windows"
# ifndef WINDOWS # ifndef WINDOWS
# define WINDOWS # define WINDOWS
# endif # endif
#endif #elif defined(_WIN64)
/******************************************************************************/
#ifdef _WIN64
# define SYS_NAME "Windows 64 bit" # define SYS_NAME "Windows 64 bit"
# ifndef WINDOWS # ifndef WINDOWS
# define WINDOWS # define WINDOWS
# endif # endif
#endif #endif
/******************************************************************************/
#if defined(AOS3) || defined(AOS4) || defined(AROS) || defined (MORPHOS) #if defined(AOS3) || defined(AOS4) || defined(AROS) || defined (MORPHOS)
# ifndef AMIGA # ifndef AMIGA
# define AMIGA # define AMIGA
# endif # endif
#endif #endif
/******************************************************************************/
#if defined(unix) || defined(__unix__) || defined(__unix) #if defined(unix) || defined(__unix__) || defined(__unix)
# ifndef UNIX # ifndef UNIX
# define UNIX # define UNIX
@ -135,7 +112,7 @@
# define SYS_NAME "Unix variant" # define SYS_NAME "Unix variant"
# endif # endif
#endif #endif
/******************************************************************************/
#if defined(HAIKU) || defined(UNIX) || defined(APPLE) #if defined(HAIKU) || defined(UNIX) || defined(APPLE)
# ifndef TERMIOS # ifndef TERMIOS
# define TERMIOS # define TERMIOS
@ -143,39 +120,38 @@
# include <stdint.h> # include <stdint.h>
# include <unistd.h> # include <unistd.h>
#endif #endif
/******************************************************************************/
#if defined(WINDOWS) #if defined(WINDOWS)
# include <stdint.h> # include <stdint.h>
#endif #endif
/******************************************************************************/
#if defined(AROS) || defined(MORPHOS) || defined(AOS4) #if defined(AROS) || defined(MORPHOS) || defined(AOS4)
# include <stdint.h> # include <stdint.h>
# include <sys/types.h> # include <sys/types.h>
#endif #endif
/******************************************************************************/
#if defined(AOS3) #if defined(AOS3)
# include <sys/types.h> # include <sys/types.h>
# define IPTR LONG*
# define uintptr_t uint32_t # define uintptr_t uint32_t
typedef u_int8_t uint8_t; typedef u_int8_t uint8_t;
typedef u_int16_t uint16_t; typedef u_int16_t uint16_t;
typedef u_int32_t uint32_t; typedef u_int32_t uint32_t;
typedef u_int64_t uint64_t; typedef u_int64_t uint64_t;
#endif #endif
/******************************************************************************/
#if (__cplusplus <= 199711L && !defined(WINDOWS)) || !defined(__cplusplus) #if (__cplusplus <= 199711L && !defined(WINDOWS)) || !defined(__cplusplus)
#ifndef nullptr # ifndef nullptr
#define nullptr 0 # define nullptr 0
#endif # endif
#elif (__cplusplus <= 199711L) && (defined(__GNUC__) || defined(__GNUG__)) #elif (__cplusplus <= 199711L) && (defined(__GNUC__) || defined(__GNUG__))
#ifndef nullptr # ifndef nullptr
#define nullptr 0 # define nullptr 0
# endif
#endif #endif
#endif
/******************************************************************************/
#define assert(x) #define assert(x)
/******************************************************************************/
/* Compilers*/ /* Compilers */
#if defined(__clang__) #if defined(__clang__)
/* Clang */ /* Clang */
# if defined(__apple_build_version__) # if defined(__apple_build_version__)
@ -228,7 +204,9 @@ typedef u_int64_t uint64_t;
# elif (_MSC_VER == 1900) # elif (_MSC_VER == 1900)
# define COMP_VERS "14.0" # define COMP_VERS "14.0"
# elif (_MSC_VER > 1900) # elif (_MSC_VER > 1900)
# define COMP_VERS "15.0+" # define COMP_VERS "15.x"
# elif (_MSC_VER > 1920)
# define COMP_VERS "16.0+"
# else # else
# define str(x) #x # define str(x) #x
# define MSC_VER_STR(x) str(x) # define MSC_VER_STR(x) str(x)
@ -261,11 +239,11 @@ typedef u_int64_t uint64_t;
# define COMP_VERS GCC_VER_STR(__GNUC__) DOT GCC_VER_STR(__GNUC_MINOR__) # define COMP_VERS GCC_VER_STR(__GNUC__) DOT GCC_VER_STR(__GNUC_MINOR__)
# endif # endif
#endif #endif
/******************************************************************************/
#define EMPTYSTRING "" #define EMPTYSTRING ""
#define SPACE " " #define SPACE " "
#define DOT "." #define DOT "."
/******************************************************************************/
#if defined(WINDOWS) #if defined(WINDOWS)
#define NEWLINE "\r\n" #define NEWLINE "\r\n"
#elif defined(APPLE) #elif defined(APPLE)
@ -273,17 +251,17 @@ typedef u_int64_t uint64_t;
#else #else
#define NEWLINE "\n" #define NEWLINE "\n"
#endif #endif
/******************************************************************************/
#ifndef __cplusplus #ifndef __cplusplus
typedef int bool; typedef int bool;
#define true 1 #define true 1
#define false 0 #define false 0
#endif #endif
/******************************************************************************/
#define LONG_BIT 32 #define LONG_BIT 32
#define wsize sizeof(unsigned int) #define wsize sizeof(unsigned int)
#define wmask (wsize - 1) #define wmask (wsize - 1)
/******************************************************************************/
#if defined(INTELCPU) || defined(i386) || defined(i486) || \ #if defined(INTELCPU) || defined(i386) || defined(i486) || \
defined(intel) || defined(x86) || defined(i86pc) || \ defined(intel) || defined(x86) || defined(i86pc) || \
defined(__i386__) || defined(_M_IX86) defined(__i386__) || defined(_M_IX86)
@ -295,18 +273,18 @@ typedef int bool;
#if defined(__x86_64__) || defined(_M_AMD64) #if defined(__x86_64__) || defined(_M_AMD64)
# define TXTCPU "amd64" # define TXTCPU "amd64"
#endif #endif
/******************************************************************************/
#if defined(__powerpc__) || defined(__powerpc64__) #if defined(__powerpc__) || defined(__powerpc64__)
# define TXTCPU "PowerPC" # define TXTCPU "PowerPC"
#endif #endif
/******************************************************************************/
#if defined(__arm__) || defined(_M_ARM) || defined(__ARM_ARCH_6__) #if defined(__arm__) || defined(_M_ARM) || defined(__ARM_ARCH_6__)
# define TXTCPU "arm" # define TXTCPU "arm"
#endif #endif
#if defined(__aarch64__) || defined(_M_ARM64) #if defined(__aarch64__) || defined(_M_ARM64)
# define TXTCPU "arm64" # define TXTCPU "arm64"
#endif #endif
/******************************************************************************/
#if defined(m68060) || defined(mc68060) #if defined(m68060) || defined(mc68060)
# define TXTCPU "68060" # define TXTCPU "68060"
#elif defined(m68040) || defined(mc68040) #elif defined(m68040) || defined(mc68040)
@ -320,33 +298,33 @@ typedef int bool;
#elif defined(m68000) || defined(mc68000) #elif defined(m68000) || defined(mc68000)
# define TXTCPU "68000+" # define TXTCPU "68000+"
#endif #endif
/******************************************************************************/
#ifndef TXTCPU #ifndef TXTCPU
//#error what cpu is this ?! //#error what cpu is this ?!
# define TXTCPU EMPTYSTRING # define TXTCPU EMPTYSTRING
#endif #endif
/******************************************************************************/
#if defined(TXTCPU) && defined(__HAVE_68881__) #if defined(TXTCPU) && defined(__HAVE_68881__)
# define TXTFPU SPACE "FPU" # define TXTFPU SPACE "FPU"
#else #else
# define TXTFPU EMPTYSTRING # define TXTFPU EMPTYSTRING
#endif #endif
/******************************************************************************/
#define TXTARCH TXTCPU TXTFPU #define TXTARCH TXTCPU TXTFPU
#define RELDATESTAMP "(11-01-2021)" #define RELDATESTAMP "(11-01-2021)"
#define TXTDOSVERSION "\0$VER: amath 1.90" SPACE RELDATESTAMP SPACE TXTARCH #define TXTDOSVERSION "\0$VER: amath 1.90" SPACE RELDATESTAMP SPACE TXTARCH
#define TXTTITLE "amath version 1.9.0" #define TXTTITLE "amath version 1.9.0"
#define TXTCOPYRIGHT "(c) 2021 Carsten Sonne Larsen" #define TXTCOPYRIGHT "(c) 2021 Carsten Sonne Larsen"
#define TXTSTARTMSG TXTTITLE SPACE TXTCOPYRIGHT #define TXTSTARTMSG TXTTITLE SPACE TXTCOPYRIGHT
/******************************************************************************/
#define TXTVERSMSG TXTTITLE SPACE RELDATESTAMP SPACE TXTARCH #define TXTVERSMSG TXTTITLE SPACE RELDATESTAMP SPACE TXTARCH
#define TXTCOMPMSG "Compiled with " COMP_NAME SPACE COMP_VERS #define TXTCOMPMSG "Compiled with " COMP_NAME SPACE COMP_VERS
/******************************************************************************/
#ifdef SYS_NAME #ifdef SYS_NAME
# define TXTSYSMSG TXTCOMPMSG " for " SYS_NAME # define TXTSYSMSG TXTCOMPMSG " for " SYS_NAME
# define SYSKNOWN 1 # define SYSKNOWN 1
#else #else
# define TXTSYSMSG TXTCOMPMSG # define TXTSYSMSG TXTCOMPMSG
#endif #endif
/******************************************************************************/
#endif #endif