diff options
author | Georg Brandl <georg@python.org> | 2013-03-25 07:01:37 +0100 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2013-03-25 07:01:37 +0100 |
commit | a809e4a54007303efb084b85ba53605adaa41b64 (patch) | |
tree | d038bc1b85b83594b29f00ae5bc10b5290ffdf71 /PC | |
parent | d08d0b1c69b19c58afb998e30eadfc7b9de26378 (diff) | |
parent | 153866ea9ab80323d247a9c49d1fdf50e07e7330 (diff) | |
download | cpython-git-3.3.1rc1.tar.gz |
merge with upstream 3.3 branchv3.3.1rc1
Diffstat (limited to 'PC')
-rw-r--r-- | PC/VC6/readme.txt | 4 | ||||
-rw-r--r-- | PC/VS8.0/pyproject.vsprops | 2 | ||||
-rw-r--r-- | PC/VS9.0/pyproject.vsprops | 2 | ||||
-rw-r--r-- | PC/bdist_wininst/extract.c | 2 | ||||
-rw-r--r-- | PC/bdist_wininst/install.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt index d6ec6e6408..e204d2fea7 100644 --- a/PC/VC6/readme.txt +++ b/PC/VC6/readme.txt @@ -153,9 +153,9 @@ _ssl Unpack into the "dist" directory, retaining the folder name from the archive - for example, the latest stable OpenSSL will install as - dist/openssl-1.0.1c + dist/openssl-1.0.1d - You need to use version 1.0.1c of OpenSSL. + You need to use version 1.0.1d of OpenSSL. You can install the NASM assembler from http://www.nasm.us/ diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops index f86cdec832..43555a6adc 100644 --- a/PC/VS8.0/pyproject.vsprops +++ b/PC/VS8.0/pyproject.vsprops @@ -58,7 +58,7 @@ />
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.1c"
+ Value="$(externalsDir)\openssl-1.0.1d"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops index 01c7ca7b3a..18581ba2ce 100644 --- a/PC/VS9.0/pyproject.vsprops +++ b/PC/VS9.0/pyproject.vsprops @@ -62,7 +62,7 @@ />
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.1c"
+ Value="$(externalsDir)\openssl-1.0.1d"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PC/bdist_wininst/extract.c b/PC/bdist_wininst/extract.c index c900f235fd..aec8eda2be 100644 --- a/PC/bdist_wininst/extract.c +++ b/PC/bdist_wininst/extract.c @@ -127,7 +127,7 @@ char *map_new_file(DWORD flags, char *filename, CloseHandle(hFile); - if (hFileMapping == INVALID_HANDLE_VALUE) { + if (hFileMapping == NULL) { if (notify) notify(SYSTEM_ERROR, "CreateFileMapping (%s)", filename); diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c index 771922cfd6..c11d45de22 100644 --- a/PC/bdist_wininst/install.c +++ b/PC/bdist_wininst/install.c @@ -1019,7 +1019,7 @@ static char *MapExistingFile(char *pathname, DWORD *psize) NULL, PAGE_READONLY, 0, 0, NULL); CloseHandle(hFile); - if (hFileMapping == INVALID_HANDLE_VALUE) + if (hFileMapping == NULL) return NULL; data = MapViewOfFile(hFileMapping, |