mirrors
/
janet
mirror of https://github.com/janet-lang/janet
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Conditionally compile marshal_ptr code.

This commit is contained in:
Calvin Rose 2023-06-24 11:42:10 -05:00
parent bd420aeb0e
commit ff2f71d2bc
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/marsh.c
View File

@ -364,11 +364,11 @@ void janet_marshal_int(JanetMarshalContext *ctx, int32_t value) {
/* Only use in unsafe - don't marshal pointers otherwise */
void janet_marshal_ptr(JanetMarshalContext *ctx, const void *ptr) {
if (sizeof(ptr) == sizeof(int64_t)) {
janet_marshal_int64(ctx, (intptr_t) ptr);
} else {
janet_marshal_int(ctx, (intptr_t) ptr);
}
#ifdef JANET_32
janet_marshal_int(ctx, (intptr_t) ptr);
#else
janet_marshal_int64(ctx, (intptr_t) ptr);
#endif
}
void janet_marshal_byte(JanetMarshalContext *ctx, uint8_t value) {
@ -1176,11 +1176,11 @@ int64_t janet_unmarshal_int64(JanetMarshalContext *ctx) {
void *janet_unmarshal_ptr(JanetMarshalContext *ctx) {
UnmarshalState *st = (UnmarshalState *)(ctx->u_state);
if (sizeof(int64_t) == sizeof(void *)) {
return (void *) ((intptr_t) read64(st, &(ctx->data)));
} else {
return (void *) ((intptr_t) readint(st, &(ctx->data)));
}
#ifdef JANET_32
return (void *) ((intptr_t) readint(st, &(ctx->data)));
#else
return (void *) ((intptr_t) read64(st, &(ctx->data)));
#endif
}
uint8_t janet_unmarshal_byte(JanetMarshalContext *ctx) {