diff --git a/libc_server.c b/libc_server.c
index c6407f4..e3b4a9c 100644
--- a/libc_server.c
+++ b/libc_server.c
@@ -46,7 +46,7 @@ struct newlib_stat {
   /* uid_t */   unsigned short st_uid;
   /* gid_t */   unsigned short st_gid;
   /* dev_t */   unsigned short st_rdev;
-  /* off_t */   long           st_size;
+  /* off_t */   int32_t        st_size;
 };
 
 struct newlib_timeval {
diff --git a/libc_server.h b/libc_server.h
index 5041659..794f50b 100644
--- a/libc_server.h
+++ b/libc_server.h
@@ -8,13 +8,7 @@
 #error INT_MAX/LONG_MAX not defined
 #endif
 
-// Find a data type that fits both pointers and integers.
-
-#if INT_MAX == LONG_MAX
-typedef uint32_t param_t;
-#else
 typedef uint64_t param_t;
-#endif
 
 enum libc_funcs {
     LIBC_WRITE,