fixes in the C runtime to avoid warnings when compiling on MacOS

This commit is contained in:
kr.angelov
2013-11-15 10:03:22 +00:00
parent d997df2864
commit a6d60f9c8d
4 changed files with 9 additions and 10 deletions

View File

@@ -111,36 +111,36 @@ extern GU_DECLARE_TYPE(GuIntDecodeExn, abstract);
(((u_) <= (posmax_)) \ (((u_) <= (posmax_)) \
? (t_) (u_) \ ? (t_) (u_) \
: (tmin_) + ((t_) ((umax_) - (u_))) < 0 \ : (tmin_) + ((t_) ((umax_) - (u_))) < 0 \
? -1 - ((t_) ((umax_) - (u_))) \ ? (t_) (-1 - ((t_) ((umax_) - (u_)))) \
: (gu_raise(err_, GuIntDecodeExn), -1)) : (t_) (gu_raise(err_, GuIntDecodeExn), -1))
static inline int8_t static inline int8_t
gu_decode_2c8(uint8_t u, GuExn* err) gu_decode_2c8(uint8_t u, GuExn* err)
{ {
return GU_DECODE_2C_(u, int8_t, UINT8_C(0xff), return GU_DECODE_2C_(u, int8_t, UINT8_C(0xff),
INT8_C(0x7f), INT8_MIN, err); UINT8_C(0x7f), INT8_MIN, err);
} }
static inline int16_t static inline int16_t
gu_decode_2c16(uint16_t u, GuExn* err) gu_decode_2c16(uint16_t u, GuExn* err)
{ {
return GU_DECODE_2C_(u, int16_t, UINT16_C(0xffff), return GU_DECODE_2C_(u, int16_t, UINT16_C(0xffff),
INT16_C(0x7fff), INT16_MIN, err); UINT16_C(0x7fff), INT16_MIN, err);
} }
static inline int32_t static inline int32_t
gu_decode_2c32(uint32_t u, GuExn* err) gu_decode_2c32(uint32_t u, GuExn* err)
{ {
return GU_DECODE_2C_(u, int32_t, UINT32_C(0xffffffff), return GU_DECODE_2C_(u, int32_t, UINT32_C(0xffffffff),
INT32_C(0x7fffffff), INT32_MIN, err); UINT32_C(0x7fffffff), INT32_MIN, err);
} }
static inline int64_t static inline int64_t
gu_decode_2c64(uint64_t u, GuExn* err) gu_decode_2c64(uint64_t u, GuExn* err)
{ {
return GU_DECODE_2C_(u, int64_t, UINT64_C(0xffffffffffffffff), return GU_DECODE_2C_(u, int64_t, UINT64_C(0xffffffffffffffff),
INT64_C(0x7fffffffffffffff), INT64_MIN, err); UINT64_C(0x7fffffffffffffff), INT64_MIN, err);
} }
double double

View File

@@ -64,8 +64,7 @@ struct GuExn {
.parent = parent_, \ .parent = parent_, \
.catch = gu_kind(catch_), \ .catch = gu_kind(catch_), \
.caught = NULL, \ .caught = NULL, \
.data.pool = pool_, \ .data = {.pool = pool_, .data = NULL} \
.data.data = NULL \
} }

View File

@@ -179,7 +179,7 @@ gu_string_is_prefix(GuString s1, GuString s2)
if (len1 > len2) if (len1 > len2)
return false; return false;
for (size_t len = len1; len--; len > 0) { for (size_t len = len1; len > 0; len--) {
if (*s1 != *s2) if (*s1 != *s2)
return false; return false;

View File

@@ -193,7 +193,7 @@ struct jit_local_state {
#define jit_retval_l(rd) ((void)jit_movr_l ((rd), _EAX)) #define jit_retval_l(rd) ((void)jit_movr_l ((rd), _EAX))
#define jit_arg_i() (_jitl.nextarg_geti < JIT_ARG_MAX \ #define jit_arg_i() (_jitl.nextarg_geti < JIT_ARG_MAX \
? _jitl.nextarg_geti++ \ ? _jitl.nextarg_geti++ \
: ((_jitl.framesize += sizeof(long)) - sizeof(long))) : (int) ((_jitl.framesize += sizeof(long)) - sizeof(long)))
#define jit_arg_c() jit_arg_i() #define jit_arg_c() jit_arg_i()
#define jit_arg_uc() jit_arg_i() #define jit_arg_uc() jit_arg_i()
#define jit_arg_s() jit_arg_i() #define jit_arg_s() jit_arg_i()