From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 11 Jan 2009 09:30:50 +0000 (+0000)
Subject: Merged revisions 68523 via svnmerge from
X-Git-Tag: v3.1a1~528
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9b54c78d7d56a87e748e685b07f4cf9a060746c;p=thirdparty%2FPython%2Fcpython.git

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.
........
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 2a3ae1278f25..4d78c7ed5ae1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -284,6 +284,8 @@ C-API
 Extension Modules
 -----------------
 
+- Issue #4279: Fix build of parsermodule under Cygwin.
+
 - Issue #4751: hashlib now releases the GIL when hashing large buffers
   (with a hardwired threshold of 2048 bytes), allowing better parallelization
   on multi-CPU systems. Contributed by Lukas Lueg (ebfe) and Victor Stinner.
diff --git a/Parser/printgrammar.c b/Parser/printgrammar.c
index ec8f4daa4ef4..ae180e11f2ea 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 6f3787ac57a1..c503a322a405 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},