mirror of https://github.com/pyodide/pyodide.git
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 02dae7ce1505a00dcd0e5a74ca07f584f5225c5a Mon Sep 17 00:00:00 2001
|
|
From: Hood <hood@mit.edu>
|
|
Date: Tue, 22 Jun 2021 20:12:45 -0700
|
|
Subject: [PATCH 06/14] Remove duplicate symbols from cfield.c
|
|
|
|
These symbols are already defined by libffi.
|
|
---
|
|
Modules/_ctypes/cfield.c | 26 --------------------------
|
|
1 file changed, 26 deletions(-)
|
|
|
|
diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
|
|
index ec6feca8b0..244c3399a5 100644
|
|
--- a/Modules/_ctypes/cfield.c
|
|
+++ b/Modules/_ctypes/cfield.c
|
|
@@ -1599,31 +1599,5 @@ typedef struct _ffi_type
|
|
} ffi_type;
|
|
*/
|
|
|
|
-/* align and size are bogus for void, but they must not be zero */
|
|
-ffi_type ffi_type_void = { 1, 1, FFI_TYPE_VOID };
|
|
-
|
|
-ffi_type ffi_type_uint8 = { 1, 1, FFI_TYPE_UINT8 };
|
|
-ffi_type ffi_type_sint8 = { 1, 1, FFI_TYPE_SINT8 };
|
|
-
|
|
-ffi_type ffi_type_uint16 = { 2, 2, FFI_TYPE_UINT16 };
|
|
-ffi_type ffi_type_sint16 = { 2, 2, FFI_TYPE_SINT16 };
|
|
-
|
|
-ffi_type ffi_type_uint32 = { 4, INT_ALIGN, FFI_TYPE_UINT32 };
|
|
-ffi_type ffi_type_sint32 = { 4, INT_ALIGN, FFI_TYPE_SINT32 };
|
|
-
|
|
-ffi_type ffi_type_uint64 = { 8, LONG_LONG_ALIGN, FFI_TYPE_UINT64 };
|
|
-ffi_type ffi_type_sint64 = { 8, LONG_LONG_ALIGN, FFI_TYPE_SINT64 };
|
|
-
|
|
-ffi_type ffi_type_float = { sizeof(float), FLOAT_ALIGN, FFI_TYPE_FLOAT };
|
|
-ffi_type ffi_type_double = { sizeof(double), DOUBLE_ALIGN, FFI_TYPE_DOUBLE };
|
|
-
|
|
-#ifdef ffi_type_longdouble
|
|
-#undef ffi_type_longdouble
|
|
-#endif
|
|
- /* This is already defined on OSX */
|
|
-ffi_type ffi_type_longdouble = { sizeof(long double), LONGDOUBLE_ALIGN,
|
|
- FFI_TYPE_LONGDOUBLE };
|
|
-
|
|
-ffi_type ffi_type_pointer = { sizeof(void *), VOID_P_ALIGN, FFI_TYPE_POINTER };
|
|
|
|
/*---------------- EOF ----------------*/
|
|
--
|
|
2.25.1
|
|
|