X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fstrtonum.h;h=ae25ff5d9a46c4aeb9ea5f9b01cee51076ddeeaf;hb=ec6703bb4d58e504fde8ea8429f9b26ab6632696;hp=fc99e23749e39147784d1cd252b2c7e6a27102ad;hpb=f1155256f7a168f5e2c0097cb4e7197b79c4f041;p=libucw.git diff --git a/ucw/strtonum.h b/ucw/strtonum.h index fc99e237..ae25ff5d 100644 --- a/ucw/strtonum.h +++ b/ucw/strtonum.h @@ -11,10 +11,10 @@ #define _STRTONUM_H #ifdef CONFIG_UCW_CLEAN_ABI -#define str_to_uintmax ucw_str_to_uintmax +#define str_to_u32 ucw_str_to_u32 +#define str_to_u64 ucw_str_to_u64 #define str_to_uint ucw_str_to_uint - -// FIXME: For backwards compatibility, will be removed soon +#define str_to_uintmax ucw_str_to_uintmax #define str_to_uns ucw_str_to_uns #endif @@ -54,10 +54,16 @@ static inline const char *str_to_##suffix(type *num, const char *str, const char STN_DECLARE_CONVERTOR(uint, uint); STN_SIGNED_CONVERTOR(int, int, uint) +STN_DECLARE_CONVERTOR(u32, u32); +STN_SIGNED_CONVERTOR(s32, s32, u32) + +STN_DECLARE_CONVERTOR(u64, u64); +STN_SIGNED_CONVERTOR(s64, s64, u64) + STN_DECLARE_CONVERTOR(uintmax_t, uintmax); STN_SIGNED_CONVERTOR(intmax_t, intmax, uintmax) -// FIXME: For backwards compatibility, will be removed soon +// FIXME: For backward compatibility, will be removed soon STN_DECLARE_CONVERTOR(uns, uns); #endif