summaryrefslogtreecommitdiffstats
path: root/PC
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-03-16 09:38:59 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-03-16 09:38:59 (GMT)
commitb88ed1549e76fadf161227d15cc307f0e8b94c59 (patch)
tree7fea10f9a15064480554f093da39f361df463c61 /PC
parentc8a03349d174379f051ab93d02a2918a15269e00 (diff)
parent3b3499ba69341a49fc842ce0d4a2f66fcb249a04 (diff)
downloadcpython-b88ed1549e76fadf161227d15cc307f0e8b94c59.zip
cpython-b88ed1549e76fadf161227d15cc307f0e8b94c59.tar.gz
cpython-b88ed1549e76fadf161227d15cc307f0e8b94c59.tar.bz2
#11565: Merge with 3.2.
Diffstat (limited to 'PC')
-rw-r--r--PC/bdist_wininst/extract.c4
-rw-r--r--PC/bdist_wininst/install.c4
-rw-r--r--PC/os2emx/dlfcn.c2
-rw-r--r--PC/os2emx/dlfcn.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/PC/bdist_wininst/extract.c b/PC/bdist_wininst/extract.c
index fc2d2b9..c900f23 100644
--- a/PC/bdist_wininst/extract.c
+++ b/PC/bdist_wininst/extract.c
@@ -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))) {
diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c
index 8601ddd..771922c 100644
--- a/PC/bdist_wininst/install.c
+++ b/PC/bdist_wininst/install.c
@@ -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(
diff --git a/PC/os2emx/dlfcn.c b/PC/os2emx/dlfcn.c
index 47c046c..ebda9cd 100644
--- a/PC/os2emx/dlfcn.c
+++ b/PC/os2emx/dlfcn.c
@@ -188,7 +188,7 @@ inv_handle:
return NULL;
}
-/* free dynamicaly-linked library */
+/* free dynamically-linked library */
int dlclose(void *handle)
{
int rc;
diff --git a/PC/os2emx/dlfcn.h b/PC/os2emx/dlfcn.h
index 49abecf..f73ae69 100644
--- a/PC/os2emx/dlfcn.h
+++ b/PC/os2emx/dlfcn.h
@@ -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 */