diff options
-rw-r--r-- | CHANGELOG.txt | 15 | ||||
-rw-r--r-- | zp/include/zp/prv/imp.h | 10 | ||||
-rw-r--r-- | zp/include/zp/prv/int.h | 2 | ||||
-rw-r--r-- | zp/include/zp/prv/sys.h | 92 | ||||
-rw-r--r-- | zp/include/zp/zp.h | 12 |
5 files changed, 73 insertions, 58 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 7024d1f..633bdd0 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -213,6 +213,21 @@ * Fix text paddings; * Fix utf32srh +* Rename sys identifiers: + - openbsd => opnbsd; + - freebsd => frebsd; + - drgnfly => drgfly; + - hurd => hrd; + - linux => lnx; + - minix => mnx; + - unix => unx; +* Rename imp identifiers: + - clang => cln; + - cray => cry; + - msvc => msc; + - tiny => tcc; + - watcom => wat; + # 0.0.2 * Migrate to CMake; diff --git a/zp/include/zp/prv/imp.h b/zp/include/zp/prv/imp.h index 200ae8e..2baaf0c 100644 --- a/zp/include/zp/prv/imp.h +++ b/zp/include/zp/prv/imp.h @@ -7,12 +7,12 @@ #if \ defined(__clang__) \ || defined(__llvm__) -#define zp_imp_clang (0x1) +#define zp_imp_cln (0x1) #endif #if \ defined(_CRAYC) -#define zp_imp_cray (0x1) +#define zp_imp_cry (0x1) #endif #if \ @@ -39,7 +39,7 @@ #if \ defined(_MSC_VER) -#define zp_imp_msvc (0x1) +#define zp_imp_msc (0x1) #endif #if \ @@ -57,10 +57,10 @@ #if \ defined(__WATCOMC__) -#define zp_imp_watcom (0x1) +#define zp_imp_wat (0x1) #endif #if \ defined(__TINYC__) -#define zp_imp_tiny (0x1) +#define zp_imp_tcc (0x1) #endif diff --git a/zp/include/zp/prv/int.h b/zp/include/zp/prv/int.h index 6d1f55a..74d82cd 100644 --- a/zp/include/zp/prv/int.h +++ b/zp/include/zp/prv/int.h @@ -161,7 +161,7 @@ typedef int long long zp_i04s; zp_sys_dos #if \ - zp_imp_msvc + zp_imp_msc #define zp_maxvalp ((zp_ptr) +0xFFFFFFFFFFFFFFFFu) #define zp_maxvalpd ((zp_ptrdif)+0x7FFFFFFFFFFFFFFF) diff --git a/zp/include/zp/prv/sys.h b/zp/include/zp/prv/sys.h index dec3ca7..78be4b0 100644 --- a/zp/include/zp/prv/sys.h +++ b/zp/include/zp/prv/sys.h @@ -5,71 +5,71 @@ */ /* - os------- macro---------- vendors----------------------------------- - clang cray edg gcc icc icx msvc pcc tiny vsi watcom xlc + os---- macro---------- vendors----------------------------------- + cln cry edg gcc icc icx msc pcc tcc vsi wat xlc - aix __Tsys_AIX__ clang - aix _AIX clang + aix __TOS_AIX__ cln + aix _AIX cln - dos __Dsys__ watcom - dos _DOS watcom + dos __DOS__ wat + dos _DOS wat - drgnfly __DragonFly__ clang + drgfly __DragonFly__ cln - freebsd __FreeBSD__ clang gcc + frebsd __FreeBSD__ cln gcc - hurd __GNU__ clang - hurd __gnu_hurd__ clang + hrd __GNU__ cln + hrd __gnu_hurd__ cln - linux __LINUX__ watcom - linux __gnu_linux__ clang cray gcc icc icx - linux __linux clang cray gcc icc icx tiny - linux __linux__ clang cray gcc icc icx pcc tiny + lnx __LINUX__ wat + lnx __gnu_linux__ cln cry gcc icc icx + lnx __linux cln cry gcc icc icx tcc + lnx __linux__ cln cry gcc icc icx pcc tcc - mac __APPLE__ clang icc - mac __MACH__ clang icc + mac __APPLE__ cln icc + mac __MACH__ cln icc - minix __minix clang + mnx __minix cln - netbsd __NetBSD__ clang + netbsd __NetBSD__ cln - openbsd __OpenBSD__ clang + opnbsd __OpenBSD__ cln - os2 __OS2__ watcom + os2 __OS2__ wat - sol __sun clang - sol __sun__ clang + sol __sun cln + sol __sun__ cln - vms __VMS vsi - vms __vms vsi + vms __VMS vsi + vms __vms vsi - win __WINDOWS__ watcom - win __WINDOWS_386__ watcom - win __w64 icc - win _WIN32 clang edg icc icx msvc - win _WIN64 clang edg icc icx msvc - win _WINDOWS watcom + win __WINDOWS__ wat + win __WINDOWS_386__ wat + win __w64 icc + win _WIN32 cln edg icc icx msc + win _WIN64 cln edg icc icx msc + win _WINDOWS wat - unix __UNIX__ watcom - unix __unix clang gcc icc icx tiny xlc - unix __unix__ clang gcc icc icx tiny xlc + unx __UNIX__ wat + unx __unix cln gcc icc icx tcc xlc + unx __unix__ cln gcc icc icx tcc xlc */ #if \ - defined(__Tsys_AIX__) \ + defined(__TOS_AIX__) \ || defined(_AIX) #define zp_sys_aix (0x1) #endif #if \ defined(__DragonFly__) -#define zp_sys_drgnfly (0x1) +#define zp_sys_drgfly (0x1) #endif #if \ defined(__FreeBSD__) -#define zp_sys_freebsd (0x1) +#define zp_sys_frebsd (0x1) #endif #if \ @@ -83,7 +83,7 @@ || defined(__gnu_linux__) \ || defined(__linux) \ || defined(__linux__) -#define zp_sys_linux (0x1) +#define zp_sys_lnx (0x1) #endif #if \ @@ -94,7 +94,7 @@ #if \ defined(__minix) -#define zp_sys_minix (0x1) +#define zp_sys_mnx (0x1) #endif #if \ @@ -104,7 +104,7 @@ #if \ defined(__OpenBSD__) -#define zp_sys_openbsd (0x1) +#define zp_sys_opnbsd (0x1) #endif #if \ @@ -137,24 +137,24 @@ #if \ zp_sys_os2 \ || zp_sys_win \ -|| defined(__Dsys__) \ +|| defined(__DOS__) \ || defined(_DOS) #define zp_sys_dos (0x1) #endif #if \ zp_sys_aix \ -|| zp_sys_drgnfly \ -|| zp_sys_freebsd \ +|| zp_sys_drgfly \ +|| zp_sys_frebsd \ || zp_sys_hurd \ -|| zp_sys_linux \ +|| zp_sys_lnx \ || zp_sys_mac \ -|| zp_sys_minix \ +|| zp_sys_mnx \ || zp_sys_netbsd \ -|| zp_sys_openbsd \ +|| zp_sys_opnbsd \ || zp_sys_sol \ || defined(__UNIX__) \ || defined(__unix) \ || defined(__unix__) -#define zp_sys_unix (0x1) +#define zp_sys_unx (0x1) #endif diff --git a/zp/include/zp/zp.h b/zp/include/zp/zp.h index 444ffa1..9aebe26 100644 --- a/zp/include/zp/zp.h +++ b/zp/include/zp/zp.h @@ -122,7 +122,7 @@ #if zp_imp_gcc #define zp_prv_rsr __restrict__ -#elif zp_imp_msvc +#elif zp_imp_msc #define zp_prv_rsr __restrict #elif zp_std_c99 #define zp_prv_rsr restrict @@ -186,7 +186,7 @@ typedef char unsigned zp_prv_bool; #if zp_prv_hasatr(__noreturn__) #define zp_noret __attribute__ ((__noreturn__)) -#elif zp_imp_msvc +#elif zp_imp_msc #define zp_noret __declspec (noreturn) #elif zp_std_c23 || zp_std_cxx #define zp_noret [[noreturn]] @@ -204,7 +204,7 @@ typedef char unsigned zp_prv_bool; #if zp_prv_hasatr(__nothrow__) #define zp_nothw __attribute__ ((__nothrow__)) -#elif zp_imp_msvc +#elif zp_imp_msc #define zp_nothw __declspec (nothrow) #else #define zp_nothw @@ -228,7 +228,7 @@ typedef char unsigned zp_prv_bool; #if zp_prv_hasbltin(__builtin_unreachable) #define zp_unrch() ((void)__builtin_unreachable()) -#elif zp_imp_msvc +#elif zp_imp_msc #define zp_unrch() ((void)__assume(0x0)) #else #define zp_unrch() (zp_trp()) @@ -268,10 +268,10 @@ zp_prv_cdecl care about the typing. */ -#if zp_sys_freebsd +#if zp_sys_frebsd typedef int zp_syscalidt; typedef int zp_syscalres; -#elif zp_sys_linux +#elif zp_sys_lnx typedef int long zp_syscalidt; typedef int long zp_syscalres; #else |