Bug #794140: cygwin builds do not embed

jason-tishler · jason-tishler · commit 6bc06eca70f4 · 2003-09-04T11:59:50.000Z
The embed2.diff patch solves the user's problem by exporting the missing
symbols from the Python core so Python can be embedded in another Cygwin
application (well, at lest vim).
diff --git a/Include/pyport.h b/Include/pyport.h
@@ -428,7 +428,12 @@ extern double hypot(double, double);
 #			define PyAPI_FUNC(RTYPE) __declspec(dllexport) RTYPE
 #			define PyAPI_DATA(RTYPE) extern __declspec(dllexport) RTYPE
 			/* module init functions inside the core need no external linkage */
-#			define PyMODINIT_FUNC void
+			/* except for Cygwin to handle embedding (FIXME: BeOS too?) */
+#			if defined(__CYGWIN__)
+#				define PyMODINIT_FUNC __declspec(dllexport) void
+#			else /* __CYGWIN__ */
+#				define PyMODINIT_FUNC void
+#			endif /* __CYGWIN__ */
 #		else /* Py_BUILD_CORE */
 			/* Building an extension module, or an embedded situation */
 			/* public Python functions and data are imported */
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
@@ -951,7 +951,7 @@ static PyMethodDef GcMethods[] = {
 	{NULL,	NULL}		/* Sentinel */
 };
 
-void
+PyMODINIT_FUNC
 initgc(void)
 {
 	PyObject *m;
diff --git a/Python/import.c b/Python/import.c
@@ -2841,7 +2841,7 @@ setint(PyObject *d, char *name, int value)
 	return err;
 }
 
-void
+PyMODINIT_FUNC
 initimp(void)
 {
 	PyObject *m, *d;
diff --git a/Python/marshal.c b/Python/marshal.c
@@ -875,7 +875,7 @@ static PyMethodDef marshal_methods[] = {
 	{NULL,		NULL}		/* sentinel */
 };
 
-void
+PyMODINIT_FUNC
 PyMarshal_Init(void)
 {
 	(void) Py_InitModule("marshal", marshal_methods);

Original file line number	Diff line number	Diff line change
`@@ -951,7 +951,7 @@ static PyMethodDef GcMethods[] = {`
`951`	`951`	`{NULL, NULL} /* Sentinel */`
`952`	`952`	`};`
`953`	`953`
`954`		`-void`
	`954`	`+PyMODINIT_FUNC`
`955`	`955`	`initgc(void)`
`956`	`956`	`{`
`957`	`957`	`PyObject *m;`
Original file line number	Diff line number	Diff line change
`@@ -2841,7 +2841,7 @@ setint(PyObject d, char name, int value)`
`2841`	`2841`	`return err;`
`2842`	`2842`	`}`
`2843`	`2843`
`2844`		`-void`
	`2844`	`+PyMODINIT_FUNC`
`2845`	`2845`	`initimp(void)`
`2846`	`2846`	`{`
`2847`	`2847`	`PyObject m, d;`
Original file line number	Diff line number	Diff line change
`@@ -875,7 +875,7 @@ static PyMethodDef marshal_methods[] = {`
`875`	`875`	`{NULL, NULL} /* sentinel */`
`876`	`876`	`};`
`877`	`877`
`878`		`-void`
	`878`	`+PyMODINIT_FUNC`
`879`	`879`	`PyMarshal_Init(void)`
`880`	`880`	`{`
`881`	`881`	`(void) Py_InitModule("marshal", marshal_methods);`