Remove win32/stdint.h and stdbool.h

Only very old Visual-C compilers before 2010 didn't contain these files.
Since the copyright of the included files conflicts with ffi's license,
we better remove it.

Fixes #693

21 files changed, 33 insertions, 329 deletions

diff --git a/ext/ffi_c/AbstractMemory.c b/ext/ffi_c/AbstractMemory.c
index 99e0c9d..1a7fcde 100644
--- a/ext/ffi_c/AbstractMemory.c
+++ b/ext/ffi_c/AbstractMemory.c
@@ -32,12 +32,9 @@
 #include <sys/types.h>
 #ifndef _MSC_VER
 # include <sys/param.h>
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
 #endif
+#include <stdint.h>
+#include <stdbool.h>
 
 #include <limits.h>
 #include <ruby.h>
diff --git a/ext/ffi_c/Buffer.c b/ext/ffi_c/Buffer.c
index 6863dda..b5f39a4 100644
--- a/ext/ffi_c/Buffer.c
+++ b/ext/ffi_c/Buffer.c
@@ -28,13 +28,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <limits.h>
 #include <ruby.h>
 #include "rbffi.h"
diff --git a/ext/ffi_c/Call.c b/ext/ffi_c/Call.c
index 8db60f2..124fe1e 100644
--- a/ext/ffi_c/Call.c
+++ b/ext/ffi_c/Call.c
@@ -34,13 +34,8 @@
 #endif
 #include <sys/types.h>
 #include <stdio.h>
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <ruby.h>
 #include <ruby/thread.h>
diff --git a/ext/ffi_c/ClosurePool.c b/ext/ffi_c/ClosurePool.c
index 45411b4..3934a3b 100644
--- a/ext/ffi_c/ClosurePool.c
+++ b/ext/ffi_c/ClosurePool.c
@@ -34,13 +34,8 @@
 #  include <sys/mman.h>
 #endif
 #include <stdio.h>
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 #if defined(__CYGWIN__) || !defined(_WIN32)
 #  include <unistd.h>
 #else
@@ -51,9 +46,6 @@
 #include <errno.h>
 #include <ruby.h>
 
-#if defined(_MSC_VER) && !defined(INT8_MIN)
-#  include "win32/stdint.h"
-#endif
 #include <ffi.h>
 #include "rbffi.h"
 #include "compat.h"
diff --git a/ext/ffi_c/DynamicLibrary.c b/ext/ffi_c/DynamicLibrary.c
index c717aec..78b3de6 100644
--- a/ext/ffi_c/DynamicLibrary.c
+++ b/ext/ffi_c/DynamicLibrary.c
@@ -29,9 +29,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifndef _MSC_VER
-#  include <stdint.h>
-#endif
+#include <stdint.h>
 #if (defined(_WIN32) || defined(__WIN32__)) && !defined(__CYGWIN__)
 # include <winsock2.h>
 # define _WINSOCKAPI_
@@ -41,9 +39,6 @@
 # include <dlfcn.h>
 #endif
 #include <ruby.h>
-#if defined(_MSC_VER) && !defined(INT8_MIN)
-#  include "win32/stdint.h"
-#endif
 
 #include <ffi.h>
 
diff --git a/ext/ffi_c/Function.c b/ext/ffi_c/Function.c
index 15bbf2f..28aaaa1 100644
--- a/ext/ffi_c/Function.c
+++ b/ext/ffi_c/Function.c
@@ -37,15 +37,8 @@
 #endif
 
 #include <stdio.h>
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# if !defined(INT8_MIN)
-#  include "win32/stdint.h"
-# endif
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <ruby.h>
 #include <ruby/thread.h>
 
diff --git a/ext/ffi_c/FunctionInfo.c b/ext/ffi_c/FunctionInfo.c
index b7b23a7..64e9874 100644
--- a/ext/ffi_c/FunctionInfo.c
+++ b/ext/ffi_c/FunctionInfo.c
@@ -33,12 +33,8 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 
 #include <errno.h>
 #include <ruby.h>
diff --git a/ext/ffi_c/LastError.c b/ext/ffi_c/LastError.c
index 8a460f3..6beecef 100644
--- a/ext/ffi_c/LastError.c
+++ b/ext/ffi_c/LastError.c
@@ -33,12 +33,8 @@
 #endif
 #include <sys/types.h>
 #include <stdio.h>
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <ruby.h>
 
diff --git a/ext/ffi_c/MemoryPointer.c b/ext/ffi_c/MemoryPointer.c
index 9dc59bb..1a64f2e 100644
--- a/ext/ffi_c/MemoryPointer.c
+++ b/ext/ffi_c/MemoryPointer.c
@@ -28,13 +28,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MSC_VER
-# include <stdbool.h>
-# include <stdint.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
+#include <stdbool.h>
+#include <stdint.h>
 #include <limits.h>
 #include <ruby.h>
 #include "rbffi.h"
diff --git a/ext/ffi_c/MethodHandle.c b/ext/ffi_c/MethodHandle.c
index 011b74f..c44167e 100644
--- a/ext/ffi_c/MethodHandle.c
+++ b/ext/ffi_c/MethodHandle.c
@@ -34,13 +34,8 @@
 # include <sys/mman.h>
 #endif
 #include <stdio.h>
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdint.h"
-# include "win32/stdbool.h"
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 #ifndef _WIN32
 # include <unistd.h>
 #endif
diff --git a/ext/ffi_c/Platform.c b/ext/ffi_c/Platform.c
index d873026..28e1c35 100644
--- a/ext/ffi_c/Platform.c
+++ b/ext/ffi_c/Platform.c
@@ -31,13 +31,8 @@
 # include <sys/param.h>
 #endif
 # include <sys/types.h>
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdint.h"
-# include "win32/stdbool.h"
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <ruby.h>
 #include <ctype.h>
 #include "rbffi_endian.h"
diff --git a/ext/ffi_c/Pointer.c b/ext/ffi_c/Pointer.c
index 353d104..ea8e592 100644
--- a/ext/ffi_c/Pointer.c
+++ b/ext/ffi_c/Pointer.c
@@ -27,13 +27,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdint.h"
-# include "win32/stdbool.h"
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <limits.h>
 #include <ruby.h>
 #include "rbffi.h"
diff --git a/ext/ffi_c/Struct.c b/ext/ffi_c/Struct.c
index 94cf141..92731c8 100644
--- a/ext/ffi_c/Struct.c
+++ b/ext/ffi_c/Struct.c
@@ -31,12 +31,9 @@
 #include <sys/types.h>
 #ifndef _MSC_VER
 # include <sys/param.h>
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
 #endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <ruby.h>
 #include "rbffi.h"
 #include "compat.h"
diff --git a/ext/ffi_c/StructByValue.c b/ext/ffi_c/StructByValue.c
index 0d9fb9c..a3255f4 100644
--- a/ext/ffi_c/StructByValue.c
+++ b/ext/ffi_c/StructByValue.c
@@ -32,13 +32,8 @@
 #endif
 #include <sys/types.h>
 #include <stdio.h>
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <ruby.h>
 
diff --git a/ext/ffi_c/StructLayout.c b/ext/ffi_c/StructLayout.c
index 9b748bd..1ed5ed1 100644
--- a/ext/ffi_c/StructLayout.c
+++ b/ext/ffi_c/StructLayout.c
@@ -32,12 +32,9 @@
 
 #ifndef _MSC_VER
 # include <sys/param.h>
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
 #endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <ruby.h>
 #include "rbffi.h"
 #include "compat.h"
diff --git a/ext/ffi_c/Thread.c b/ext/ffi_c/Thread.c
index aab3344..f6a8387 100644
--- a/ext/ffi_c/Thread.c
+++ b/ext/ffi_c/Thread.c
@@ -28,12 +28,7 @@
  */
 
 #include <stddef.h>
-#ifndef _MSC_VER
 #include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
 
 #if defined(__CYGWIN__) || !defined(_WIN32)
 # include <pthread.h>
diff --git a/ext/ffi_c/Thread.h b/ext/ffi_c/Thread.h
index 46a65c6..8c335e4 100644
--- a/ext/ffi_c/Thread.h
+++ b/ext/ffi_c/Thread.h
@@ -30,12 +30,7 @@
 #ifndef RBFFI_THREAD_H
 #define	RBFFI_THREAD_H
 
-#ifndef _MSC_VER
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
+#include <stdbool.h>
 #include <ruby.h>
 #include "extconf.h"
 
diff --git a/ext/ffi_c/Type.c b/ext/ffi_c/Type.c
index bc82857..7776bb0 100644
--- a/ext/ffi_c/Type.c
+++ b/ext/ffi_c/Type.c
@@ -28,7 +28,7 @@
  */
 
 #ifndef _MSC_VER
-#include <sys/param.h>
+# include <sys/param.h>
 #endif
 
 #include <sys/types.h>
diff --git a/ext/ffi_c/Variadic.c b/ext/ffi_c/Variadic.c
index aafe072..d9d7fd4 100644
--- a/ext/ffi_c/Variadic.c
+++ b/ext/ffi_c/Variadic.c
@@ -33,13 +33,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <ruby.h>
 
 #include <ffi.h>
diff --git a/ext/ffi_c/win32/stdbool.h b/ext/ffi_c/win32/stdbool.h
deleted file mode 100644
index 9130a8b..0000000
--- a/ext/ffi_c/win32/stdbool.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef FFI_STDBOOL_H
-#define FFI_STDBOOL_H
-
-typedef int bool;
-#define true 1
-#define false 0
-
-#endif /* FFI_STDBOOL_H */
\ No newline at end of file
diff --git a/ext/ffi_c/win32/stdint.h b/ext/ffi_c/win32/stdint.h
deleted file mode 100644
index 6ce7457..0000000
--- a/ext/ffi_c/win32/stdint.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* stdint.h standard header */
-#if !defined(_MSC_VER) && !defined(INT8_MIN)
-#pragma once
-#ifndef _STDINT
-#define _STDINT
-#ifndef RC_INVOKED
-#include <yvals.h>
-
-/* NB: assumes
-	byte has 8 bits
-	long is 32 bits
-	pointer can convert to and from long long
-	long long is longest type
- */
-
-_C_STD_BEGIN
-		/* TYPE DEFINITIONS */
-typedef signed char int8_t;
-typedef short int16_t;
-typedef int int32_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-
-typedef signed char int_least8_t;
-typedef short int_least16_t;
-typedef int int_least32_t;
-
-typedef unsigned char uint_least8_t;
-typedef unsigned short uint_least16_t;
-typedef unsigned int uint_least32_t;
-
-typedef char int_fast8_t;
-typedef int int_fast16_t;
-typedef int int_fast32_t;
-
-typedef unsigned char uint_fast8_t;
-typedef unsigned int uint_fast16_t;
-typedef unsigned int uint_fast32_t;
-
-#ifndef _INTPTR_T_DEFINED
- #define _INTPTR_T_DEFINED
- #ifdef _WIN64
-typedef __int64 intptr_t;
- #else /* _WIN64 */
-typedef _W64 int intptr_t;
- #endif /* _WIN64 */
-#endif /* _INTPTR_T_DEFINED */
-
-#ifndef _UINTPTR_T_DEFINED
- #define _UINTPTR_T_DEFINED
- #ifdef _WIN64
-typedef unsigned __int64 uintptr_t;
- #else /* _WIN64 */
-typedef _W64 unsigned int uintptr_t;
- #endif /* _WIN64 */
-#endif /* _UINTPTR_T_DEFINED */
-
-typedef _Longlong int64_t;
-typedef _ULonglong uint64_t;
-
-typedef _Longlong int_least64_t;
-typedef _ULonglong uint_least64_t;
-
-typedef _Longlong int_fast64_t;
-typedef _ULonglong uint_fast64_t;
-
-typedef _Longlong intmax_t;
-typedef _ULonglong uintmax_t;
-
-		/* LIMIT MACROS */
-#define INT8_MIN	(-0x7f - _C2)
-#define INT16_MIN	(-0x7fff - _C2)
-#define INT32_MIN	(-0x7fffffff - _C2)
-
-#define INT8_MAX	0x7f
-#define INT16_MAX	0x7fff
-#define INT32_MAX	0x7fffffff
-#define UINT8_MAX	0xff
-#define UINT16_MAX	0xffff
-#define UINT32_MAX	0xffffffff
-
-#define INT_LEAST8_MIN		(-0x7f - _C2)
-#define INT_LEAST16_MIN		(-0x7fff - _C2)
-#define INT_LEAST32_MIN		(-0x7fffffff - _C2)
-
-#define INT_LEAST8_MAX		0x7f
-#define INT_LEAST16_MAX		0x7fff
-#define INT_LEAST32_MAX		0x7fffffff
-#define UINT_LEAST8_MAX		0xff
-#define UINT_LEAST16_MAX	0xffff
-#define UINT_LEAST32_MAX	0xffffffff
-
-#define INT_FAST8_MIN		(-0x7f - _C2)
-#define INT_FAST16_MIN		(-0x7fff - _C2)
-#define INT_FAST32_MIN		(-0x7fffffff - _C2)
-
-#define INT_FAST8_MAX		0x7f
-#define INT_FAST16_MAX		0x7fff
-#define INT_FAST32_MAX		0x7fffffff
-#define UINT_FAST8_MAX		0xff
-#define UINT_FAST16_MAX		0xffff
-#define UINT_FAST32_MAX		0xffffffff
-
- #if _INTPTR == 0 || _INTPTR == 1
-#define INTPTR_MAX			0x7fffffff
-#define INTPTR_MIN			(-INTPTR_MAX - _C2)
-#define UINTPTR_MAX			0xffffffff
-
- #else /* _INTPTR == 2 */
-#define INTPTR_MIN			(-_LLONG_MAX - _C2)
-#define INTPTR_MAX			_LLONG_MAX
-#define UINTPTR_MAX			_ULLONG_MAX
-#endif /* _INTPTR */
-
-#define INT8_C(x)	(x)
-#define INT16_C(x)	(x)
-#define INT32_C(x)	((x) + (INT32_MAX - INT32_MAX))
-
-#define UINT8_C(x)	(x)
-#define UINT16_C(x)	(x)
-#define UINT32_C(x)	((x) + (UINT32_MAX - UINT32_MAX))
-
-#ifdef _WIN64
- #define PTRDIFF_MIN		INT64_MIN
- #define PTRDIFF_MAX		INT64_MAX
-#else /* _WIN64 */
- #define PTRDIFF_MIN		INT32_MIN
- #define PTRDIFF_MAX		INT32_MAX
-#endif /* _WIN64 */
-
-#define SIG_ATOMIC_MIN	INT32_MIN
-#define SIG_ATOMIC_MAX	INT32_MAX
-
-#ifndef SIZE_MAX
- #ifdef _WIN64
-  #define SIZE_MAX		UINT64_MAX
- #else /* _WIN64 */
-  #define SIZE_MAX		UINT32_MAX
- #endif /* _WIN64 */
-#endif /* SIZE_MAX */
-
-#define WCHAR_MIN	0x0000
-#define WCHAR_MAX	0xffff
-
-#define WINT_MIN	0x0000
-#define WINT_MAX	0xffff
-
- #define INT64_MIN	(-0x7fffffffffffffff - _C2)
- #define INT64_MAX	0x7fffffffffffffff
- #define UINT64_MAX	0xffffffffffffffffU
-
- #define INT_LEAST64_MIN	(-0x7fffffffffffffff - _C2)
- #define INT_LEAST64_MAX	0x7fffffffffffffff
- #define UINT_LEAST64_MAX	0xffffffffffffffffU
-
- #define INT_FAST64_MIN		(-0x7fffffffffffffff - _C2)
- #define INT_FAST64_MAX		0x7fffffffffffffff
- #define UINT_FAST64_MAX	0xffffffffffffffffU
-
- #define INTMAX_MIN		(-0x7fffffffffffffff - _C2)
- #define INTMAX_MAX		0x7fffffffffffffff
- #define UINTMAX_MAX	0xffffffffffffffffU
-
-#define INT64_C(x)		((x) + (INT64_MAX - INT64_MAX))
-#define UINT64_C(x)		((x) + (UINT64_MAX - UINT64_MAX))
-#define INTMAX_C(x)		INT64_C(x)
-#define UINTMAX_C(x)	UINT64_C(x)
-_C_STD_END
-#endif /* RC_INVOKED */
-#endif /* _STDINT */
-
- #if defined(_STD_USING)
-using _CSTD int8_t; using _CSTD int16_t;
-using _CSTD int32_t; using _CSTD int64_t;
-
-using _CSTD uint8_t; using _CSTD uint16_t;
-using _CSTD uint32_t; using _CSTD uint64_t;
-
-using _CSTD int_least8_t; using _CSTD int_least16_t;
-using _CSTD int_least32_t;  using _CSTD int_least64_t;
-using _CSTD uint_least8_t; using _CSTD uint_least16_t;
-using _CSTD uint_least32_t; using _CSTD uint_least64_t;
-
-using _CSTD intmax_t; using _CSTD uintmax_t;
-
-using _CSTD uintptr_t;
-using _CSTD intptr_t;
-
-using _CSTD int_fast8_t; using _CSTD int_fast16_t;
-using _CSTD int_fast32_t; using _CSTD int_fast64_t;
-using _CSTD uint_fast8_t; using _CSTD uint_fast16_t;
-using _CSTD uint_fast32_t; using _CSTD uint_fast64_t;
- #endif /* defined(_STD_USING) */
-
-/*
- * Copyright (c) 1992-2009 by P.J. Plauger.  ALL RIGHTS RESERVED.
- * Consult your license regarding permissions and restrictions.
-V5.20:0009 */
-#endif /* !defined(_MSC_VER) && !defined(INT8_MIN) */
\ No newline at end of file