summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Behnel <stefan_ml@behnel.de>2020-05-05 11:54:35 +0200
committerStefan Behnel <stefan_ml@behnel.de>2020-05-05 11:54:35 +0200
commit4b90db366e1cf7b360573a92931a70ff3fb6fa0d (patch)
tree8f536dea12ed34c3bf72aebc0c232f0c93cd2a7f
parentb278dfcadf9059c99acf2eb2389c063b291c19b3 (diff)
downloadcython-4b90db366e1cf7b360573a92931a70ff3fb6fa0d.tar.gz
Mark the embedded C main() function in the embedding test as "extern C" in C++ to see if that fixes the C++ builds in MSVC.
-rw-r--r--docs/examples/tutorial/embedding/embedded_main.c8
-rw-r--r--tests/windows_bugs.txt3
2 files changed, 8 insertions, 3 deletions
diff --git a/docs/examples/tutorial/embedding/embedded_main.c b/docs/examples/tutorial/embedding/embedded_main.c
index 36f145660..e14901a5e 100644
--- a/docs/examples/tutorial/embedding/embedded_main.c
+++ b/docs/examples/tutorial/embedding/embedded_main.c
@@ -3,6 +3,10 @@
/* This include file is automatically generated by Cython for 'public' functions. */
#include "embedded.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
int
main(int argc, char *argv[])
{
@@ -59,3 +63,7 @@ exit_with_error:
Py_Finalize();
return 1;
}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/tests/windows_bugs.txt b/tests/windows_bugs.txt
index b197fd7f8..52c1b0fbc 100644
--- a/tests/windows_bugs.txt
+++ b/tests/windows_bugs.txt
@@ -31,6 +31,3 @@ cpp_template_subclasses
# MSVC lacks "complex.h"
complex_numbers_cmath_T2891
-
-# Embedding seems to have a non-trivial setup on Windows
-embedded