[GR-42006] Make jni build work on Windows

Author: timfel

graalpython/com.oracle.graal.python.cext/include/cpython/code.h

@@ -181,13 +181,13 @@ PyAPI_FUNC(int) _PyCode_SetExtra(PyObject *code, Py_ssize_t index,
                                  void *extra);
 
 /** API for initializing the line number table. */
-int _PyCode_InitAddressRange(PyCodeObject* co, PyCodeAddressRange *bounds);
+PyAPI_FUNC(int) _PyCode_InitAddressRange(PyCodeObject* co, PyCodeAddressRange *bounds);
 
 /** Out of process API for initializing the line number table. */
-void PyLineTable_InitAddressRange(const char *linetable, Py_ssize_t length, int firstlineno, PyCodeAddressRange *range);
+PyAPI_FUNC(void) PyLineTable_InitAddressRange(const char *linetable, Py_ssize_t length, int firstlineno, PyCodeAddressRange *range);
 
 /** API for traversing the line number table. */
-int PyLineTable_NextAddressRange(PyCodeAddressRange *range);
-int PyLineTable_PreviousAddressRange(PyCodeAddressRange *range);
+PyAPI_FUNC(int) PyLineTable_NextAddressRange(PyCodeAddressRange *range);
+PyAPI_FUNC(int) PyLineTable_PreviousAddressRange(PyCodeAddressRange *range);
 
 

graalpython/com.oracle.graal.python.cext/include/cpython/dictobject.h

@@ -45,7 +45,7 @@ PyAPI_FUNC(int) _PyDict_DelItem_KnownHash(PyObject *mp, PyObject *key,
                                           Py_hash_t hash);
 PyAPI_FUNC(int) _PyDict_DelItemIf(PyObject *mp, PyObject *key,
                                   int (*predicate)(PyObject *value));
-PyDictKeysObject *_PyDict_NewKeysForClass(void);
+PyAPI_FUNC(PyDictKeysObject *) _PyDict_NewKeysForClass(void);
 PyAPI_FUNC(int) _PyDict_Next(
     PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value, Py_hash_t *hash);
 
@@ -56,11 +56,11 @@ PyAPI_FUNC(int) _PyDict_ContainsId(PyObject *, struct _Py_Identifier *);
 PyAPI_FUNC(PyObject *) _PyDict_NewPresized(Py_ssize_t minused);
 PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp);
 PyAPI_FUNC(int) _PyDict_HasOnlyStringKeys(PyObject *mp);
-Py_ssize_t _PyDict_KeysSize(PyDictKeysObject *keys);
+PyAPI_FUNC(Py_ssize_t) _PyDict_KeysSize(PyDictKeysObject *keys);
 PyAPI_FUNC(Py_ssize_t) _PyDict_SizeOf(PyDictObject *);
 PyAPI_FUNC(PyObject *) _PyDict_Pop(PyObject *, PyObject *, PyObject *);
-PyObject *_PyDict_Pop_KnownHash(PyObject *, PyObject *, Py_hash_t, PyObject *);
-PyObject *_PyDict_FromKeys(PyObject *, PyObject *, PyObject *);
+PyAPI_FUNC(PyObject *) _PyDict_Pop_KnownHash(PyObject *, PyObject *, Py_hash_t, PyObject *);
+PyAPI_FUNC(PyObject *) _PyDict_FromKeys(PyObject *, PyObject *, PyObject *);
 #define _PyDict_HasSplitTable(d) ((d)->ma_values != NULL)
 
 /* Like PyDict_Merge, but override can be 0, 1 or 2.  If override is 0,
@@ -74,9 +74,9 @@ PyAPI_FUNC(int) _PyDict_SetItemId(PyObject *dp, struct _Py_Identifier *key, PyOb
 PyAPI_FUNC(int) _PyDict_DelItemId(PyObject *mp, struct _Py_Identifier *key);
 PyAPI_FUNC(void) _PyDict_DebugMallocStats(FILE *out);
 
-int _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr, PyObject *name, PyObject *value);
-PyObject *_PyDict_LoadGlobal(PyDictObject *, PyDictObject *, PyObject *);
-Py_ssize_t _PyDict_GetItemHint(PyDictObject *, PyObject *, Py_ssize_t, PyObject **);
+PyAPI_FUNC(int) _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr, PyObject *name, PyObject *value);
+PyAPI_FUNC(PyObject *) _PyDict_LoadGlobal(PyDictObject *, PyDictObject *, PyObject *);
+PyAPI_FUNC(Py_ssize_t) _PyDict_GetItemHint(PyDictObject *, PyObject *, Py_ssize_t, PyObject **);
 
 /* _PyDictView */
 

graalpython/com.oracle.graal.python.cext/include/cpython/frameobject.h

@@ -76,7 +76,7 @@ PyAPI_FUNC(PyFrameObject *) PyFrame_New(PyThreadState *, PyCodeObject *,
                                         PyObject *, PyObject *);
 
 /* only internal use */
-PyFrameObject*
+PyAPI_FUNC(PyFrameObject*)
 _PyFrame_New_NoTrack(PyThreadState *, PyFrameConstructor *, PyObject *);
 
 

graalpython/com.oracle.graal.python.cext/include/cpython/pyerrors.h

@@ -145,7 +145,7 @@ PyAPI_FUNC(PyObject *) _PyErr_TrySetFromCause(
 
 /* In signalmodule.c */
 
-int PySignal_SetWakeupFd(int fd);
+PyAPI_FUNC(int) PySignal_SetWakeupFd(int fd);
 PyAPI_FUNC(int) _PyErr_CheckSignals(void);
 
 /* Support for adding program text to SyntaxErrors */

graalpython/com.oracle.graal.python.cext/include/datetime.h

@@ -119,7 +119,7 @@ typedef struct
 } PyDateTime_DateTime;          /* hastzinfo true */
 
 
-PyObject* PyTruffle_PyDateTime_GET_TZINFO(PyObject*);
+PyAPI_FUNC(PyObject*) PyTruffle_PyDateTime_GET_TZINFO(PyObject*);
 
 /* Apply for date and datetime instances. */
 

graalpython/com.oracle.graal.python.cext/include/genobject.h

@@ -47,7 +47,7 @@ PyAPI_FUNC(PyObject *) PyGen_NewWithQualName(PyFrameObject *,
     PyObject *name, PyObject *qualname);
 PyAPI_FUNC(int) _PyGen_SetStopIterationValue(PyObject *);
 PyAPI_FUNC(int) _PyGen_FetchStopIterationValue(PyObject **);
-PyObject *_PyGen_yf(PyGenObject *);
+PyAPI_FUNC(PyObject *) _PyGen_yf(PyGenObject *);
 PyAPI_FUNC(void) _PyGen_Finalize(PyObject *self);
 
 #ifndef Py_LIMITED_API
@@ -60,7 +60,7 @@ PyAPI_DATA(PyTypeObject) PyCoro_Type;
 PyAPI_DATA(PyTypeObject) _PyCoroWrapper_Type;
 
 #define PyCoro_CheckExact(op) Py_IS_TYPE(op, &PyCoro_Type)
-PyObject *_PyCoro_GetAwaitableIter(PyObject *o);
+PyAPI_FUNC(PyObject *) _PyCoro_GetAwaitableIter(PyObject *o);
 PyAPI_FUNC(PyObject *) PyCoro_New(PyFrameObject *,
     PyObject *name, PyObject *qualname);
 
@@ -92,7 +92,7 @@ PyAPI_FUNC(PyObject *) PyAsyncGen_New(PyFrameObject *,
 
 #define PyAsyncGen_CheckExact(op) Py_IS_TYPE(op, &PyAsyncGen_Type)
 
-PyObject *_PyAsyncGenValueWrapperNew(PyObject *);
+PyAPI_FUNC(PyObject *) _PyAsyncGenValueWrapperNew(PyObject *);
 
 #endif
 

graalpython/com.oracle.graal.python.cext/include/modsupport.h

@@ -138,7 +138,7 @@ PyAPI_FUNC(PyObject * const *) _PyArg_UnpackKeywords(
      _PyArg_UnpackKeywords((args), (nargs), (kwargs), (kwnames), (parser), \
                            (minpos), (maxpos), (minkw), (buf)))
 
-void _PyArg_Fini(void);
+PyAPI_FUNC(void) _PyArg_Fini(void);
 #endif   /* Py_LIMITED_API */
 
 // Add an attribute with name 'name' and value 'obj' to the module 'mod.

graalpython/com.oracle.graal.python.cext/include/pyconfig.h

@@ -74,6 +74,22 @@
 // required for __UINT32_MAX__ etc.
 #include <limits.h>
 
+#if defined(_MSC_VER) && !defined(__clang__)
+// defines based on MSVC documentation
+#define __SIZEOF_INT__ 4
+#define __SIZEOF_SHORT__ 2
+#define __SIZEOF_LONG__ 4
+#define __SIZEOF_LONG_LONG__ 8
+#define __SIZEOF_INT128__ 16
+#define __SIZEOF_FLOAT__ 4
+#define __SIZEOF_DOUBLE__ 8
+#define __SIZEOF_LONG_DOUBLE__ 8
+#define __SIZEOF_SIZE_T__ 8
+#define __SIZEOF_UINTPTR_T__ 8
+#define __SIZEOF_POINTER__ 8
+#define __SIZEOF_WCHAR_T__ 2
+#endif
+
 // defines based on Clang defines
 #define SIZEOF_DOUBLE __SIZEOF_DOUBLE__
 #define SIZEOF_FLOAT __SIZEOF_FLOAT__
@@ -140,6 +156,9 @@
 #define HAVE_SYS_WAIT_H
 #define TIME_WITH_SYS_TIME 1
 #else
+#define HAVE_COPYSIGN 1
+#define HAVE_ROUND 1
+#define HAVE_HYPOT 1
 #define NT_THREADS 1
 #endif
 

graalpython/com.oracle.graal.python.cext/include/warnings.h

@@ -62,7 +62,7 @@ PyErr_WarnExplicitFormat(PyObject *category,
 #endif
 
 #ifndef Py_LIMITED_API
-void _PyErr_WarnUnawaitedCoroutine(PyObject *coro);
+PyAPI_FUNC(void) _PyErr_WarnUnawaitedCoroutine(PyObject *coro);
 #endif
 
 #ifdef __cplusplus

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -1350,11 +1350,11 @@ PyAPI_FUNC(void) truffle_set_tp_flags(PyTypeObject* type, unsigned long flags) {
     type->tp_flags = flags;
 }
 
-int truffle_BASETYPE_check(PyObject* type) {
+PyAPI_FUNC(int) truffle_BASETYPE_check(PyObject* type) {
     return PyType_HasFeature(Py_TYPE(type), Py_TPFLAGS_BASETYPE);
 }
 
-void* truffle_get_constant(int entry) {
+PyAPI_FUNC(void*) truffle_get_constant(int entry) {
 	// this needs to correspond to CApiContext.resolveConstant
 	switch(entry) {
 	case 0: