Commit34d8d35

committed

Merge branch 'Jeff17Robbins-master'

2 parents5f2e2e2 +627cac0 commit34d8d35Copy full SHA for 34d8d35

File tree

+16

-3

lines changed

+16

-3

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`- Ivan Cronyn ([@cronan](https://github.com/cronan))`
`35`	`35`	`- Jan Krivanek ([@jakrivan](https://github.com/jakrivan))`
`36`	`36`	`- Jeff Reback ([@jreback](https://github.com/jreback))`
	`37`	`+- Jeff Robbins ([@jeff17robbins](https://github.com/jeff17robbins))`
`37`	`38`	`- Joe Frayne ([@jfrayne](https://github.com/jfrayne))`
`38`	`39`	`- Joe Lidbetter ([@jmlidbetter](https://github.com/jmlidbetter))`
`39`	`40`	`- Joe Savage ([@s4v4g3](https://github.com/s4v4g3))`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`// Auto-generated by geninterop.py.`
`3`		`-// DO NOTMODIFIY BY HAND.`
	`3`	`+// DO NOTMODIFY BY HAND.`
`4`	`4`
`5`	`5`
`6`	`6`	`#ifPYTHON38`
`@@ -84,6 +84,7 @@ public static int magic()`
`84`	`84`	`publicstaticinttp_version_tag=0;`
`85`	`85`	`publicstaticinttp_finalize=0;`
`86`	`86`	`publicstaticinttp_vectorcall=0;`
	`87`	`+publicstaticinttp_print=0;`
`87`	`88`	`publicstaticintam_await=0;`
`88`	`89`	`publicstaticintam_aiter=0;`
`89`	`90`	`publicstaticintam_anext=0;`
`@@ -149,4 +150,3 @@ public static int magic()`
`149`	`150`	`}`
`150`	`151`
`151`	`152`	`#endif`
`152`		`-`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,8 @@ def visit(self, node):`
`76`	`76`	`self.visit_struct(node)`
`77`	`77`	`elifisinstance(node,c_ast.Decl):`
`78`	`78`	`self.visit_decl(node)`
	`79`	`+elifisinstance(node,c_ast.FuncDecl):`
	`80`	`+self.visit_funcdecl(node)`
`79`	`81`	`elifisinstance(node,c_ast.PtrDecl):`
`80`	`82`	`self.visit_ptrdecl(node)`
`81`	`83`	`elifisinstance(node,c_ast.IdentifierType):`
`@@ -110,6 +112,9 @@ def visit_struct(self, struct):`
`110`	`112`	`defvisit_decl(self,decl):`
`111`	`113`	`self.visit(decl.type)`
`112`	`114`
	`115`	`+defvisit_funcdecl(self,funcdecl):`
	`116`	`+self.visit(funcdecl.type)`
	`117`	`+`
`113`	`118`	`defvisit_ptrdecl(self,ptrdecl):`
`114`	`119`	`self.__ptr_decl_depth+=1`
`115`	`120`	`self.visit(ptrdecl.type)`
`@@ -177,6 +182,13 @@ def preprocess_python_headers():`
`177`	`182`	`"-D","_POSIX_THREADS"`
`178`	`183`	`]`
`179`	`184`
	`185`	`+ifos.name=='nt':`
	`186`	`+defines.extend([`
	`187`	`+"-D","__inline=inline",`
	`188`	`+"-D","__ptr32=",`
	`189`	`+"-D","__declspec(x)=",`
	`190`	`+ ])`
	`191`	`+`
`180`	`192`	`ifhasattr(sys,"abiflags"):`
`181`	`193`	`if"d"insys.abiflags:`
`182`	`194`	`defines.extend(("-D","PYTHON_WITH_PYDEBUG"))`
`@@ -216,7 +228,7 @@ def gen_interop_code(members):`
`216`	`228`	`defines_str=" && ".join(defines)`
`217`	`229`	`class_definition="""`
`218`	`230`	`// Auto-generated by %s.`
`219`		`-// DO NOTMODIFIY BY HAND.`
	`231`	`+// DO NOTMODIFY BY HAND.`
`220`	`232`
`221`	`233`
`222`	`234`	`#if %s`

Comments

(0)