From: Ori Bernstein <ori@eigenstate.org>
Date: Tue, 24 Mar 2020 21:45:15 +0000 (-0700)
Subject: turn ptrdiff_t into a 64 bit type
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=2f67e21393c25943f25e116fa6912b7d92dbca4e;p=plan9front.git

turn ptrdiff_t into a 64 bit type

while technically a 32 bit ptrdiff_t is in spec on
systems with 64 bit ponters as long as we guarantee
that individual objects are small enough, this can
confuse legitimate code, so lets fix this.
---

diff --git a/amd64/include/ape/stddef.h b/amd64/include/ape/stddef.h
new file mode 100644
index 000000000..2a217ba90
--- /dev/null
+++ b/amd64/include/ape/stddef.h
@@ -0,0 +1,7 @@
+#ifndef __STDDEF_ARCH_H
+#define __STDDEF_ARCH_H
+
+typedef long long _ptrdiff_t;
+#include "/sys/include/ape/stddef.h"
+
+#endif /* __STDDEF_ARCH_H */
diff --git a/arm64/include/ape/stddef.h b/arm64/include/ape/stddef.h
new file mode 100644
index 000000000..2a217ba90
--- /dev/null
+++ b/arm64/include/ape/stddef.h
@@ -0,0 +1,7 @@
+#ifndef __STDDEF_ARCH_H
+#define __STDDEF_ARCH_H
+
+typedef long long _ptrdiff_t;
+#include "/sys/include/ape/stddef.h"
+
+#endif /* __STDDEF_ARCH_H */
diff --git a/sys/include/ape/stddef.h b/sys/include/ape/stddef.h
index 28f5707c8..ab6625b4e 100644
--- a/sys/include/ape/stddef.h
+++ b/sys/include/ape/stddef.h
@@ -1,6 +1,10 @@
 #ifndef __STDDEF_H
 #define __STDDEF_H
 
+#ifndef __STDDEF_ARCH_H
+typedef long _ptrdiff_t;
+#endif
+
 #ifndef NULL
 #ifdef __cplusplus
 #define NULL 0
@@ -10,7 +14,7 @@
 #endif
 #define offsetof(ty,mem) ((size_t) &(((ty *)0)->mem))
 
-typedef long ptrdiff_t;
+typedef _ptrdiff_t ptrdiff_t;
 #ifndef _SIZE_T
 #define _SIZE_T
 typedef unsigned long size_t;