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

[martin.v.loewis]

Author: martin.v.loewis
Date: Sun Jan 11 10:33:05 2009
New Revision: 68526

Log:
Merged revisions 68525 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r68525 | martin.v.loewis | 2009-01-11 10:30:50 +0100 (So, 11 Jan 2009) | 9 lines
  
  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/release30-maint/   (props changed)
   python/branches/release30-maint/Misc/NEWS
   python/branches/release30-maint/Parser/printgrammar.c
   python/branches/release30-maint/Python/graminit.c

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Sun Jan 11 10:33:05 2009
@@ -217,6 +217,8 @@
 Extension Modules
 -----------------
 
+- Issue #4279: Fix build of parsermodule under Cygwin.
+
 - Issue #4228: Pack negative values the same way as 2.4 in struct's L format.
 
 - Issue #1040026: Fix os.times result on systems where HZ is incorrect.

Modified: python/branches/release30-maint/Parser/printgrammar.c
==============================================================================
--- python/branches/release30-maint/Parser/printgrammar.c	(original)
+++ python/branches/release30-maint/Parser/printgrammar.c	Sun Jan 11 10:33:05 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/release30-maint/Python/graminit.c
==============================================================================
--- python/branches/release30-maint/Python/graminit.c	(original)
+++ python/branches/release30-maint/Python/graminit.c	Sun Jan 11 10:33:05 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},