mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
#11565: Merge with 3.2.
This commit is contained in:
commit
b88ed1549e
93 changed files with 124 additions and 124 deletions
|
@ -54,7 +54,7 @@ BOOL ensure_directory(char *pathname, char *new_part, NOTIFYPROC notify)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
/* XXX Should better explicitely specify
|
||||
/* XXX Should better explicitly specify
|
||||
* uncomp_size and file_times instead of pfhdr!
|
||||
*/
|
||||
char *map_new_file(DWORD flags, char *filename,
|
||||
|
@ -164,7 +164,7 @@ extract_file(char *dst, char *src, int method, int comp_size,
|
|||
zstream.avail_out = uncomp_size;
|
||||
|
||||
/* Apparently an undocumented feature of zlib: Set windowsize
|
||||
to negative values to supress the gzip header and be compatible with
|
||||
to negative values to suppress the gzip header and be compatible with
|
||||
zip! */
|
||||
result = TRUE;
|
||||
if (Z_OK != (x = inflateInit2(&zstream, -15))) {
|
||||
|
|
|
@ -148,7 +148,7 @@ BOOL pyc_compile, pyo_compile;
|
|||
the permissions of the current user. */
|
||||
HKEY hkey_root = (HKEY)-1;
|
||||
|
||||
BOOL success; /* Installation successfull? */
|
||||
BOOL success; /* Installation successful? */
|
||||
char *failure_reason = NULL;
|
||||
|
||||
HANDLE hBitmap;
|
||||
|
@ -797,7 +797,7 @@ run_installscript(char *pathname, int argc, char **argv, char **pOutput)
|
|||
|
||||
tempname = tempnam(NULL, NULL);
|
||||
// We use a static CRT while the Python version we load uses
|
||||
// the CRT from one of various possibile DLLs. As a result we
|
||||
// the CRT from one of various possible DLLs. As a result we
|
||||
// need to redirect the standard handles using the API rather
|
||||
// than the CRT.
|
||||
redirected = CreateFile(
|
||||
|
|
|
@ -188,7 +188,7 @@ inv_handle:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
/* free dynamicaly-linked library */
|
||||
/* free dynamically-linked library */
|
||||
int dlclose(void *handle)
|
||||
{
|
||||
int rc;
|
||||
|
|
|
@ -42,7 +42,7 @@ void *dlopen(char *filename, int flags);
|
|||
/* return a pointer to the `symbol' in DLL */
|
||||
void *dlsym(void *handle, char *symbol);
|
||||
|
||||
/* free dynamicaly-linked library */
|
||||
/* free dynamically-linked library */
|
||||
int dlclose(void *handle);
|
||||
|
||||
/* return a string describing last occurred dl error */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue