Merge branch 'Jeff17Robbins-master'

filmor · filmor · commit 34d8d350fbbc · 2019-11-28T22:21:11.000+01:00
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -34,6 +34,7 @@
 -   Ivan Cronyn ([@cronan](https://github.com/cronan))
 -   Jan Krivanek ([@jakrivan](https://github.com/jakrivan))
 -   Jeff Reback ([@jreback](https://github.com/jreback))
+-   Jeff Robbins ([@jeff17robbins](https://github.com/jeff17robbins))
 -   Joe Frayne ([@jfrayne](https://github.com/jfrayne))
 -   Joe Lidbetter ([@jmlidbetter](https://github.com/jmlidbetter))
 -   Joe Savage ([@s4v4g3](https://github.com/s4v4g3))
diff --git a/src/runtime/interop38.cs b/src/runtime/interop38.cs
@@ -1,6 +1,6 @@
 
 // Auto-generated by geninterop.py.
-// DO NOT MODIFIY BY HAND.
+// DO NOT MODIFY BY HAND.
 
 
 #if PYTHON38
@@ -84,6 +84,7 @@ public static int magic()
         public static int tp_version_tag = 0;
         public static int tp_finalize = 0;
         public static int tp_vectorcall = 0;
+        public static int tp_print = 0;
         public static int am_await = 0;
         public static int am_aiter = 0;
         public static int am_anext = 0;
@@ -149,4 +150,3 @@ public static int magic()
 }
 
 #endif
-
diff --git a/tools/geninterop/geninterop.py b/tools/geninterop/geninterop.py
@@ -76,6 +76,8 @@ def visit(self, node):
             self.visit_struct(node)
         elif isinstance(node, c_ast.Decl):
             self.visit_decl(node)
+        elif isinstance(node, c_ast.FuncDecl):
+            self.visit_funcdecl(node)
         elif isinstance(node, c_ast.PtrDecl):
             self.visit_ptrdecl(node)
         elif isinstance(node, c_ast.IdentifierType):
@@ -110,6 +112,9 @@ def visit_struct(self, struct):
     def visit_decl(self, decl):
         self.visit(decl.type)
 
+    def visit_funcdecl(self, funcdecl):
+        self.visit(funcdecl.type)
+
     def visit_ptrdecl(self, ptrdecl):
         self.__ptr_decl_depth += 1
         self.visit(ptrdecl.type)
@@ -177,6 +182,13 @@ def preprocess_python_headers():
         "-D", "_POSIX_THREADS"
     ]
 
+    if os.name == 'nt':
+        defines.extend([
+            "-D", "__inline=inline",
+            "-D", "__ptr32=",
+            "-D", "__declspec(x)=",
+        ])
+
     if hasattr(sys, "abiflags"):
         if "d" in sys.abiflags:
             defines.extend(("-D", "PYTHON_WITH_PYDEBUG"))
@@ -216,7 +228,7 @@ def gen_interop_code(members):
     defines_str = " && ".join(defines)
     class_definition = """
 // Auto-generated by %s.
-// DO NOT MODIFIY BY HAND.
+// DO NOT MODIFY BY HAND.
 
 
 #if %s
