[Python-checkins] r68524 - in python/branches/release26-maint: Misc/NEWS Parser/printgrammar.c Python/graminit.c

Sun Jan 11 10:28:08 CET 2009

Author: martin.v.loewis
Date: Sun Jan 11 10:28:08 2009
New Revision: 68524
Log:
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.
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Misc/NEWS
 python/branches/release26-maint/Parser/printgrammar.c
 python/branches/release26-maint/Python/graminit.c
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================

--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Jan 11 10:28:08 2009
@@ -306,6 +306,8 @@
 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.
Modified: python/branches/release26-maint/Parser/printgrammar.c
==============================================================================
--- python/branches/release26-maint/Parser/printgrammar.c	(original)
+++ python/branches/release26-maint/Parser/printgrammar.c	Sun Jan 11 10:28:08 2009
@@ -16,6 +16,7 @@
 	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");
Modified: python/branches/release26-maint/Python/graminit.c
==============================================================================
--- python/branches/release26-maint/Python/graminit.c	(original)
+++ python/branches/release26-maint/Python/graminit.c	Sun Jan 11 10:28:08 2009
@@ -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},
