From 4f15d08ea188f3e5c4c710f5d2d4a7f8fb0d88b7 Mon Sep 17 00:00:00 2001 From: Matthias Gatto Date: Wed, 26 Jul 2017 10:23:59 +0200 Subject: [PATCH] Revert "use int for ssize_t, (u)intptr_t instead of long in stddef.h" This reverts commit 52622c3c0365ad497ce1188e433ac5f0a721c283. Because 28b7c9 was right. --- include/stddef.h | 9 +-------- libtcc.c | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/include/stddef.h b/include/stddef.h index 8ed6b3e..694d503 100644 --- a/include/stddef.h +++ b/include/stddef.h @@ -2,18 +2,11 @@ #define _STDDEF_H typedef __SIZE_TYPE__ size_t; +typedef __PTRDIFF_TYPE__ ssize_t; typedef __WCHAR_TYPE__ wchar_t; typedef __PTRDIFF_TYPE__ ptrdiff_t; - -#ifdef __ILP32__ -typedef int ssize_t; -typedef int intptr_t; -typedef unsigned int uintptr_t; -#else -typedef __PTRDIFF_TYPE__ ssize_t; typedef __PTRDIFF_TYPE__ intptr_t; typedef __SIZE_TYPE__ uintptr_t; -#endif #ifndef __int8_t_defined #define __int8_t_defined diff --git a/libtcc.c b/libtcc.c index ec81992..6a5e452 100644 --- a/libtcc.c +++ b/libtcc.c @@ -848,8 +848,8 @@ LIBTCCAPI TCCState *tcc_new(void) tcc_define_symbol(s, "__LP64__", NULL); #else /* Other 32bit systems. */ - tcc_define_symbol(s, "__SIZE_TYPE__", "unsigned long"); - tcc_define_symbol(s, "__PTRDIFF_TYPE__", "long"); + tcc_define_symbol(s, "__SIZE_TYPE__", "unsigned int"); + tcc_define_symbol(s, "__PTRDIFF_TYPE__", "int"); tcc_define_symbol(s, "__ILP32__", NULL); #endif