Remove lots of unneeded definitions from core.h

livecodefraser · livecodefraser · commit 132a534f6431 · 2016-10-07T12:14:36.000+01:00
All out platforms supply the required C standard library headers;
just use them directly instead.
diff --git a/libcore/include/core.h b/libcore/include/core.h
@@ -34,82 +34,16 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef _STDARG_H
 #include <stdarg.h>
-#endif
-
 #include <math.h>
-
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WIN32
+#include <stddef.h>
 #include <stdint.h>
-#else
-
-typedef unsigned char uint8_t;
-typedef signed char int8_t;
-typedef unsigned short uint16_t;
-typedef signed short int16_t;
-typedef unsigned int uint32_t;
-typedef signed int int32_t;
-
-// MDW 2013-04.15: only typedef if necessary
-#if !defined(uint64_t)
-	#ifdef __LP64__
-		typedef unsigned long int uint64_t;
-	#else
-		typedef unsigned long long int uint64_t;
-	#endif
-#endif
-
-#if !defined(int64_t)
-	#ifdef __LP64__
-		typedef long int int64_t;
-	#else
-		typedef long long int int64_t;
-	#endif
-#endif
-
-#endif
 
 typedef uint32_t uindex_t;
 typedef int32_t index_t;
 typedef uint32_t hash_t;
 typedef int32_t compare_t;
 
-#if (defined(_MACOSX) || defined(TARGET_SUBPLATFORM_IPHONE)) && !defined(_SIZE_T)
-	typedef long unsigned int size_t;
-#endif
-
-#if defined(_LINUX) && !defined(_SIZE_T)
-	// MDW-2013-04-15: [[ x64 ]] make 64-bit safe
-	#ifdef __LP64__
-		typedef long unsigned int size_t;
-	#else
-		typedef unsigned int size_t;
-	#endif
-#endif
-
-#ifndef _UINTPTR_T
-	#define _UINTPTR_T
-	// MDW-2013-04-15: [[ x64 ]] make 64-bit safe
-	#ifdef __LP64__
-		typedef uint64_t uintptr_t;
-	#else
-		typedef uint32_t uintptr_t;
-	#endif
-#endif
-
-#ifndef _INTPTR_T
-	#define _INTPTR_T
-	// MDW-2013-04-15: [[ x64 ]] make 64-bit safe
-	#ifdef __LP64__
-		typedef int64_t intptr_t;
-	#else
-		typedef int32_t intptr_t;
-	#endif
-#endif
-
 typedef char char_t;
 
 #if defined(_WIN32) || defined(_WINCE)
@@ -125,31 +59,17 @@ typedef const struct __CFData * CFDataRef;
 #endif
 
 #ifndef nil
-#define nil 0
+#  ifdef __cplusplus
+#    define nil nullptr
+#  else
+#    define nil 0
+#  endif
 #endif
 
 #if defined(_MACOSX) && defined(__LP64__)
 #define _MACOSX_NOCARBON
 #endif
 
-#if defined(_WINDOWS)
-typedef char *va_list;
-#elif defined(_MACOSX)
-typedef __builtin_va_list va_list;
-#elif defined(_LINUX)
-typedef __builtin_va_list va_list;
-#elif defined(__EMSCRIPTEN__)
-typedef __builtin_va_list va_list;
-#endif
-
-#if defined(_MOBILE) && defined(TARGET_SUBPLATFORM_ANDROID)
-typedef uint32_t size_t;
-#endif
-
-#if defined(__EMSCRIPTEN__)
-typedef uint32_t size_t;
-#endif
-
 // AL-2014-07-30: [[ Bug 13000 ]] Ensure ___LITTLE_ENDIAN__ is defined appropriately
 #ifdef __ppc__
 #undef __LITTLE_ENDIAN__
