Commitb8ff9df

committed

Pull in HANDLE.

1 parent391c0e2 commitb8ff9dfCopy full SHA for b8ff9df

File tree

+15

-8

lines changed

+15

-8

lines changed

Lines changed: 13 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,13 @@ extern "C" {`
`13`	`13`	`#include"pycore_atomic.h"// _Py_atomic_address`
`14`	`14`
`15`	`15`	`#ifdefMS_WINDOWS`
`16`		`-#ifndefSOCKET`
`17`		`-#ifdefPYCORE_SIGNAL_REQUIRES_WINSOCK`
	`16`	`+#ifdefPYCORE_SIGNAL_WITH_PRE_INCLUDES`
	`17`	`+#ifndefSOCKET`
`18`	`18`	`# error "<winsock2.h> must be included before this header"`
`19`	`19`	`# endif`
`20`		`-#endif`
`21`		`-#ifndefHANDLE`
`22`		`-#error "<windows.h> must be included before this header"`
	`20`	`+# ifndefHANDLE`
	`21`	`+# error "<windows.h> must be included before this header"`
	`22`	`+#endif`
`23`	`23`	`# endif`
`24`	`24`	`#endif`
`25`	`25`	`#include<signal.h>// NSIG`
`@@ -62,7 +62,8 @@ struct _signals_runtime_state {`
`62`	`62`	`# ifdefSOCKET`
`63`	`63`	`SOCKETfd;`
`64`	`64`	`# else`
`65`		`-// <winsock2.h> wasn't included already, so we fake it.`
	`65`	`+// <winsock2.h> wasn't included already,`
	`66`	`+// we use something compatible with SOCKET.`
`66`	`67`	`intfd;`
`67`	`68`	`# endif`
`68`	`69`	`#elif defined(__VXWORKS__)`
`@@ -84,7 +85,13 @@ struct _signals_runtime_state {`
`84`	`85`	`PyObject*default_handler;`
`85`	`86`	`PyObject*ignore_handler;`
`86`	`87`	`#ifdefMS_WINDOWS`
	`88`	`+# ifdefHANDLE`
`87`	`89`	`HANDLEsigint_event;`
	`90`	`+# else`
	`91`	`+// <windows.h> wasn't included already,`
	`92`	`+// we use something compatible with HANDLE.`
	`93`	`+void*sigint_event;`
	`94`	`+# endif`
`88`	`95`	`#endif`
`89`	`96`
`90`	`97`	`/* True if the main interpreter thread exited due to an unhandled`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`
`6`	`6`	`#ifdefMS_WINDOWS`
`7`	`7`	`# if !defined(SOCKET)&& defined(Py_INTERNAL_SIGNAL_H)`
`8`		`-# error "pycore_signal.h included withoutPYCORE_SIGNAL_REQUIRES_WINSOCK"`
	`8`	`+# error "pycore_signal.h included withoutPYCORE_SIGNAL_WITH_PRE_INCLUDES"`
`9`	`9`	`# endif`
`10`		`-# define_PYCORE_SIGNAL_REQUIRES_WINSOCK`
	`10`	`+# definePYCORE_SIGNAL_WITH_PRE_INCLUDES`
`11`	`11`	`#endif`
`12`	`12`
`13`	`13`	`#include"Python.h"`

Comments

(0)