From ff2f71d2bca868206bee1923dcc8cd3ae5ec066e Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Sat, 24 Jun 2023 11:42:10 -0500
Subject: [PATCH] Conditionally compile marshal_ptr code.

---
 src/core/marsh.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/core/marsh.c b/src/core/marsh.c
index 7e3e1db7..b4dae0ba 100644
--- a/src/core/marsh.c
+++ b/src/core/marsh.c
@@ -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) {