Fixed some build issues and updated docs.

diff --git a/Include/structmember.h b/Include/structmember.h
index 10555b1a2d46e5eb4d90b0f3055c7d086b9fa202..acdb84ee74acd1c8d5a1b74a98269e6966c624bf 100644 (file)
--- a/Include/structmember.h
+++ b/Include/structmember.h
@@ -69,8 +69,8 @@ typedef struct PyMemberDef {
 /* Flags */
 #define READONLY       1
 #define READ_RESTRICTED        2
-#define WRITE_RESTRICTED 4
-#define RESTRICTED     (READ_RESTRICTED | WRITE_RESTRICTED)
+#define PY_WRITE_RESTRICTED 4
+#define RESTRICTED     (READ_RESTRICTED | PY_WRITE_RESTRICTED)
 
 
 /* Current API, use this */

diff --git a/Misc/NEWS b/Misc/NEWS
index f68ac904ae274ef34375dc2eeff2c5ae68f641b3..e0d3f8b3b5c1f30b9d0da630adc0598566bf154c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -39,6 +39,12 @@ Core and Builtins
   streams (fileno(stdin) < 0). For now this happens only for Windows GUI
   apps and scripts started with `pythonw.exe`.
 
+- Added PCbuild9 directory for VS 2008.
+
+- Renamed structmember.h WRITE_RESTRICTED to PY_WRITE_RESTRICTED to work
+  around a name clash with VS 2008 on Windows.
+
+
 Extension Modules
 -----------------
 

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index 808f4eae2227414ad4c5650095cb2ff906198cfd..408be4c0640105abbcfe07d867751b3037450983 100644 (file)
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -227,10 +227,10 @@ PyFunction_SetAnnotations(PyObject *op, PyObject *annotations)
 static PyMemberDef func_memberlist[] = {
         {"__closure__",   T_OBJECT,     OFF(func_closure),
         RESTRICTED|READONLY},
-        {"__doc__",       T_OBJECT,     OFF(func_doc), WRITE_RESTRICTED},
+        {"__doc__",       T_OBJECT,     OFF(func_doc), PY_WRITE_RESTRICTED},
         {"__globals__",   T_OBJECT,     OFF(func_globals),
         RESTRICTED|READONLY},
-        {"__module__",    T_OBJECT,     OFF(func_module), WRITE_RESTRICTED},
+        {"__module__",    T_OBJECT,     OFF(func_module), PY_WRITE_RESTRICTED},
         {NULL}  /* Sentinel */
 };
 

diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index 8a8ca03d8b4264ad0101005e2d7034ded4a55229..73e0790c3073a9570867e0aafef9ce00790a852e 100644 (file)
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -167,7 +167,7 @@ static PyGetSetDef meth_getsets [] = {
 #define OFF(x) offsetof(PyCFunctionObject, x)
 
 static PyMemberDef meth_members[] = {
-       {"__module__",    T_OBJECT,     OFF(m_module), WRITE_RESTRICTED},
+       {"__module__",    T_OBJECT,     OFF(m_module), PY_WRITE_RESTRICTED},
        {NULL}
 };
 

diff --git a/PCbuild9/pythoncore.vcproj b/PCbuild9/pythoncore.vcproj
index 7601d48c89fd33e3a700a16feed2a0a06e9a4597..8431f313b2f60b13bd3962063c4747dd01161bd3 100644 (file)
--- a/PCbuild9/pythoncore.vcproj
+++ b/PCbuild9/pythoncore.vcproj
@@ -61,6 +61,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalDependencies="getbuildinfo.o"
                                OutputFile="./python30.dll"
                                IgnoreDefaultLibraryNames="libc"
                                ProgramDatabaseFile="python30.pdb"
@@ -137,6 +138,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalDependencies="getbuildinfo.o"
                                OutputFile="./python30.dll"
                                IgnoreDefaultLibraryNames="libc"
                                ProgramDatabaseFile="python30.pdb"
@@ -213,6 +215,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalDependencies="getbuildinfo.o"
                                OutputFile="$(PyDllName)_d.dll"
                                IgnoreDefaultLibraryNames="libc"
                                ProgramDatabaseFile="python30_d.pdb"
@@ -1180,10 +1183,6 @@
                                RelativePath="..\PC\errmap.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\PCBuild9_old\getbuildinfo.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\PC\getpathp.c"
                                >

diff --git a/PCbuild9/readme.txt b/PCbuild9/readme.txt
index 62c21920e85c1d4232c640eac5a4055f61e6c5b2..1fd8cc350891ab7eec7197c4750b728a9fe00bb1 100644 (file)
--- a/PCbuild9/readme.txt
+++ b/PCbuild9/readme.txt
@@ -227,7 +227,7 @@ _ssl
 
     Get the source code through
 
-    svn export http://svn.python.org/projects/external/openssl-0.9.8a
+    svn export http://svn.python.org/projects/external/openssl-0.9.8g
 
     Alternatively, get the latest version from http://www.openssl.org.
     You can (theoretically) use any version of OpenSSL you like - the