diff --git a/header_pars.c b/header_pars.c index d94e75a5fe297fd946a646cba27a0a614541993c..28109543acfecd7b25e9f1fe8183a50a3865e7c4 100644 --- a/header_pars.c +++ b/header_pars.c @@ -1,6 +1,6 @@ #include <stdlib.h> -#include <my_inttypes.h> +#include <leon_inttypes.h> #include <cmp_io.h> #include <cmp_debug.h> diff --git a/include/my_inttypes.h b/include/leon_inttypes.h similarity index 72% rename from include/my_inttypes.h rename to include/leon_inttypes.h index 83c3723947a8f808a09cf0e906fb3999e27f8ec2..694af3e1e217129e775ee5d7a5ba5656be2b206a 100644 --- a/include/my_inttypes.h +++ b/include/leon_inttypes.h @@ -1,5 +1,5 @@ /** - * @file my_inttypes.h + * @file leon_inttypes.h * @author Dominik Loidolt (dominik.loidolt@univie.ac.at) * @date 2021 * @@ -18,8 +18,8 @@ * @warning Does not fully implement the standard. */ -#ifndef MY_INTTYPES_H -#define MY_INTTYPES_H +#ifndef LEON_INTTYPES_H +#define LEON_INTTYPES_H #ifndef __sparc__ # include <inttypes.h> @@ -49,6 +49,30 @@ # define PRIX32 "lX" #endif /*PRIX32*/ +#ifndef PRId64 +# define PRId64 "lld" +#endif /*PRId64*/ + +#ifndef PRIi64 +# define PRIi64 "lli" +#endif /*PRIi64*/ + +#ifndef PRIo64 +# define PRIo64 "llo" +#endif /*PRIo64*/ + +#ifndef PRIu64 +# define PRIu64 "llu" +#endif /* PRIu64 */ + +#ifndef PRIx64 +# define PRIx64 "llx" +#endif /*PRIx64*/ + +#ifndef PRIX64 +# define PRIX64 "llX" +#endif /*PRIX64*/ + #endif /* __sparc__ */ -#endif /* MY_INTTYPES_H */ +#endif /* LEON_INTTYPES_H */ diff --git a/lib/cmp_entity.c b/lib/cmp_entity.c index 1c188150c832318cabecf355f4978a2b2578246c..d82a0fd531e49f548058ac96c9de80427fa1509d 100644 --- a/lib/cmp_entity.c +++ b/lib/cmp_entity.c @@ -35,7 +35,7 @@ #include <cmp_support.h> #include <cmp_data_types.h> #include <cmp_entity.h> -#include <my_inttypes.h> +#include <leon_inttypes.h> #ifdef HAS_TIME_H diff --git a/lib/cmp_guess.c b/lib/cmp_guess.c index 15109a328a8833ae03ddabd1bc13614ada9536ad..bda3c3e9d3743a544db5303c4aa4d690ff7c6c11 100644 --- a/lib/cmp_guess.c +++ b/lib/cmp_guess.c @@ -25,7 +25,7 @@ #include <cmp_data_types.h> #include <cmp_icu.h> #include <cmp_guess.h> -#include <my_inttypes.h> +#include <leon_inttypes.h> #define CMP_GUESS_MAX_CAL_STEPS 20274 diff --git a/lib/cmp_io.c b/lib/cmp_io.c index 485fc4e3b2989a67ea260f448fae5ae34d71b791..57f9ec54f09db2d141fdeb31b9ff7e022f82d801 100644 --- a/lib/cmp_io.c +++ b/lib/cmp_io.c @@ -34,7 +34,7 @@ #include <rdcu_cmd.h> #include <byteorder.h> #include <cmp_data_types.h> -#include <my_inttypes.h> +#include <leon_inttypes.h> /* directory to convert from data_type to string */ diff --git a/lib/cmp_support.c b/lib/cmp_support.c index e1dcfe51a93714f57bb786b61bd3e6bd1c8fdb44..cbad0cf28618dc8dba28e2539bb5e6774075f0ed 100644 --- a/lib/cmp_support.c +++ b/lib/cmp_support.c @@ -21,7 +21,7 @@ #include <cmp_support.h> #include <cmp_debug.h> -#include <my_inttypes.h> +#include <leon_inttypes.h> /** diff --git a/lib/rmap.c b/lib/rmap.c index 3583576d3ad65ac96ee62fb6b850938d4986e696..52953d03e61f3384184336df8436e73d2a1e7eb8 100644 --- a/lib/rmap.c +++ b/lib/rmap.c @@ -24,8 +24,9 @@ #include <stdlib.h> #include <stdio.h> +#include <leon_inttypes.h> #include <rmap.h> -#include <my_inttypes.h> + /** diff --git a/test/cmp_decmp/test_cmp_decmp.c b/test/cmp_decmp/test_cmp_decmp.c index 5f06a701a5cface25ce7d33645e9b0c7cb7746bb..da5345071ba3b0749603787d182609be044c9687 100644 --- a/test/cmp_decmp/test_cmp_decmp.c +++ b/test/cmp_decmp/test_cmp_decmp.c @@ -30,7 +30,7 @@ #include <cmp_icu.h> #include <decmp.h> #include <cmp_data_types.h> -#include <my_inttypes.h> +#include <leon_inttypes.h> #if defined __has_include # if __has_include(<time.h>) diff --git a/test/cmp_icu/test_cmp_icu.c b/test/cmp_icu/test_cmp_icu.c index 87caed6cc53fda65893788b45c994e1cf6c78f9c..b78cb52e7c8867d482abfe8d3717f2e0f3664152 100644 --- a/test/cmp_icu/test_cmp_icu.c +++ b/test/cmp_icu/test_cmp_icu.c @@ -18,7 +18,7 @@ #include <stdlib.h> -#include <inttypes.h> +#include <leon_inttypes.h> #if defined __has_include # if __has_include(<time.h>)