Rework smallint machinery so that it will reliably fail to compile

even if arch overrides smallint size. Makes it easier to spot bugs
on such arches.

diff --git a/include/unistd.h b/include/unistd.h
index 53ee6df..3b72b82 100644 (file)
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1109,11 +1109,11 @@ __END_DECLS
 
 
 #ifdef UCLIBC_INTERNAL
-#ifndef smallint /* if arch didn't override it in bits/wordsize.h */
-typedef int smallint;
-typedef unsigned smalluint;
-#define smallint smallint
+#ifndef smallint_type /* if arch didn't override it in bits/wordsize.h */
+#define smallint_type int
 #endif
+typedef signed smallint_type smallint;
+typedef unsigned smallint_type smalluint;
 #endif
 
 

diff --git a/libc/sysdeps/linux/i386/bits/wordsize.h b/libc/sysdeps/linux/i386/bits/wordsize.h
index 143feda..7c3cd9c 100644 (file)
--- a/libc/sysdeps/linux/i386/bits/wordsize.h
+++ b/libc/sysdeps/linux/i386/bits/wordsize.h
@@ -19,9 +19,7 @@
 #define __WORDSIZE     32
 
 #ifdef UCLIBC_INTERNAL
-#ifndef smallint
-typedef signed char smallint;
-typedef unsigned char smalluint;
-#define smallint smallint
+#ifndef smallint_type
+#define smallint_type char
 #endif
 #endif