From d7431c7cdbf0509ebe3e42888189dfe3cf6c7910 Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Sat, 24 Jun 2023 11:54:04 -0500
Subject: [PATCH] Revert "Test removing 32bit ptr marshalling."

This reverts commit 566b45ea443d1d1c9b0bc6c345c4c33b3e07ed0e.
---
 src/core/ev.c    | 2 +-
 src/core/marsh.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/ev.c b/src/core/ev.c
index 298be79f..17fe442e 100644
--- a/src/core/ev.c
+++ b/src/core/ev.c
@@ -438,7 +438,7 @@ static void *janet_stream_unmarshal(JanetMarshalContext *ctx) {
     p->_mask = 0;
     p->state = NULL;
     p->flags = (uint32_t) janet_unmarshal_int(ctx);
-    p->methods = janet_unmarshal_ptr(ctx);
+    p->methods =  janet_unmarshal_ptr(ctx);
 #ifdef JANET_WINDOWS
     p->handle = (JanetHandle) janet_unmarshal_int64(ctx);
 #else
diff --git a/src/core/marsh.c b/src/core/marsh.c
index ba09f305..b4dae0ba 100644
--- a/src/core/marsh.c
+++ b/src/core/marsh.c
@@ -364,7 +364,7 @@ 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) {
-#ifdef JANET_32_DONTUSE
+#ifdef JANET_32
     janet_marshal_int(ctx, (intptr_t) ptr);
 #else
     janet_marshal_int64(ctx, (intptr_t) ptr);
@@ -1176,7 +1176,7 @@ int64_t janet_unmarshal_int64(JanetMarshalContext *ctx) {
 
 void *janet_unmarshal_ptr(JanetMarshalContext *ctx) {
     UnmarshalState *st = (UnmarshalState *)(ctx->u_state);
-#ifdef JANET_32_DONTUSE
+#ifdef JANET_32
     return (void *) ((intptr_t) readint(st, &(ctx->data)));
 #else
     return (void *) ((intptr_t) read64(st, &(ctx->data)));