Author: christian.heimes
Date: Sat Nov 17 20:08:41 2007
New Revision: 59037
Modified:
python/branches/py3k/Include/structmember.h
python/branches/py3k/Misc/NEWS
python/branches/py3k/Objects/funcobject.c
python/branches/py3k/Objects/methodobject.c
python/branches/py3k/PCbuild9/pythoncore.vcproj
python/branches/py3k/PCbuild9/readme.txt
Log:
Fixed some build issues and updated docs.
Modified: python/branches/py3k/Include/structmember.h
==============================================================================
--- python/branches/py3k/Include/structmember.h (original)
+++ python/branches/py3k/Include/structmember.h Sat Nov 17 20:08:41 2007
@@ -69,8 +69,8 @@
/* 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 */
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Sat Nov 17 20:08:41 2007
@@ -39,6 +39,12 @@
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
-----------------
Modified: python/branches/py3k/Objects/funcobject.c
==============================================================================
--- python/branches/py3k/Objects/funcobject.c (original)
+++ python/branches/py3k/Objects/funcobject.c Sat Nov 17 20:08:41 2007
@@ -227,10 +227,10 @@
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 */
};
Modified: python/branches/py3k/Objects/methodobject.c
==============================================================================
--- python/branches/py3k/Objects/methodobject.c (original)
+++ python/branches/py3k/Objects/methodobject.c Sat Nov 17 20:08:41 2007
@@ -167,7 +167,7 @@
#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}
};
Modified: python/branches/py3k/PCbuild9/pythoncore.vcproj
==============================================================================
--- python/branches/py3k/PCbuild9/pythoncore.vcproj (original)
+++ python/branches/py3k/PCbuild9/pythoncore.vcproj Sat Nov 17 20:08:41 2007
@@ -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"
@@ -1181,10 +1184,6 @@
>
</File>
<File
- RelativePath="..\PCBuild9_old\getbuildinfo.c"
- >
- </File>
- <File
RelativePath="..\PC\getpathp.c"
>
</File>
Modified: python/branches/py3k/PCbuild9/readme.txt
==============================================================================
--- python/branches/py3k/PCbuild9/readme.txt (original)
+++ python/branches/py3k/PCbuild9/readme.txt Sat Nov 17 20:08:41 2007
@@ -227,7 +227,7 @@
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
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
