Include integer limits from generic stdint.h in system-specific stdint.h

1 files changed, 16 insertions, 2 deletions

diff --git a/sys/include/ape/stdint.h b/sys/include/ape/stdint.h
index 2a5ed9520..4aa5381ae 100644
--- a/sys/include/ape/stdint.h
+++ b/sys/include/ape/stdint.h
@@ -1,8 +1,14 @@
-#ifndef _STDINT_H_
-#define _STDINT_H_ 1
+#ifndef _STDINT_GENERIC_H_
+#define _STDINT_GENERIC_H_ 1
 
+/*
+ * Default for 32 bit architectures, overriden by
+ * /$objtype/include/ape/stdint.h if needed.
+ */
+#ifndef _STDINT_ARCH_H_
 typedef int _intptr_t;
 typedef unsigned int _uintptr_t;
+#endif
 
 typedef char int8_t;
 typedef short int16_t;
@@ -12,6 +18,7 @@ typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned int uint32_t;
 typedef unsigned long long uint64_t;
+
 typedef _intptr_t intptr_t;
 typedef _uintptr_t uintptr_t;
 
@@ -35,4 +42,11 @@ typedef _uintptr_t uintptr_t;
 #define UINT32_MAX	0xffffffffL
 #define UINT64_MAX	0xffffffffffffffffULL
 
+/* 
+ * Right now, all of our size_t types are 32 bit, even on
+ * 64 bit architectures.
+ */
+#define SIZE_MIN	UINT32_MIN
+#define SIZE_MAX	UINT32_MAX
+
 #endif