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

diff --git a/Misc/NEWS b/Misc/NEWS
index 65c06d1e0487dbe0d08d27b81e83272c8f8fe17c..6f750e0e21fade0ac5b2633f804ba0f7c3c0bf15 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -217,6 +217,8 @@ C-API
 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.

diff --git a/Parser/printgrammar.c b/Parser/printgrammar.c
index ec8f4daa4ef45e40e32e98242fdb9c31805434d5..ae180e11f2ea89bf67aed6214e13bbc63f6de5f2 100644 (file)
--- 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 6f3787ac57a1d8109f08f1a6ef89fa2e4278ab34..c503a322a405f6cbda24d949dfa2c9c2a66b38a4 100644 (file)
--- 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},