summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2009-01-11 09:28:08 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2009-01-11 09:28:08 (GMT)
commit8798ac47ea9b9d5bb8829cc40b35b80ab635cbd3 (patch)
tree718d5cd05fda06ee0f55d5a1bbaea55d4b0d09e5
parent64e718e6058d0233c12bc339865c7a1b8b403bfd (diff)
downloadcpython-8798ac47ea9b9d5bb8829cc40b35b80ab635cbd3.zip
cpython-8798ac47ea9b9d5bb8829cc40b35b80ab635cbd3.tar.gz
cpython-8798ac47ea9b9d5bb8829cc40b35b80ab635cbd3.tar.bz2
Merged revisions 68523 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r68523 | martin.v.loewis | 2009-01-11 10:26:54 +0100 (So, 11 Jan 2009) | 2 lines Issue #4279: Fix build of parsermodule under Cygwin. ........
-rw-r--r--Misc/NEWS2
-rw-r--r--Parser/printgrammar.c1
-rw-r--r--Python/graminit.c1
3 files changed, 4 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 9c77b8c..b603841 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -306,6 +306,8 @@ C-API
Extension Modules
-----------------
+- Issue #4279: Fix build of parsermodule under Cygwin.
+
- Issue #4051: Prevent conflict of UNICODE macros in cPickle.
- Issue #4228: Pack negative values the same way as 2.4 in struct's L format.
diff --git a/Parser/printgrammar.c b/Parser/printgrammar.c
index ec8f4da..ae180e1 100644
--- a/Parser/printgrammar.c
+++ b/Parser/printgrammar.c
@@ -16,6 +16,7 @@ printgrammar(grammar *g, FILE *fp)
fprintf(fp, "/* Generated by Parser/pgen */\n\n");
fprintf(fp, "#include \"pgenheaders.h\"\n");
fprintf(fp, "#include \"grammar.h\"\n");
+ fprintf(fp, "PyAPI_DATA(grammar) _PyParser_Grammar;\n");
printdfas(g, fp);
printlabels(g, fp);
fprintf(fp, "grammar _PyParser_Grammar = {\n");
diff --git a/Python/graminit.c b/Python/graminit.c
index e65a992..ec2f421 100644
--- a/Python/graminit.c
+++ b/Python/graminit.c
@@ -2,6 +2,7 @@
#include "pgenheaders.h"
#include "grammar.h"
+PyAPI_DATA(grammar) _PyParser_Grammar;
static arc arcs_0_0[3] = {
{2, 1},
{3, 1},