mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Tweaks to keep the Microsoft compiler quier.

Browse source
This commit is contained in:
Guido van Rossum 1997-04-09 19:24:53 +00:00
parent 8017767420
commit 644a12b00c
8 changed files with 36 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Python/compile.c
View file

@ -182,6 +182,9 @@ typeobject Codetype = {
(hashfunc)code_hash, /*tp_hash*/
};
#define NAME_CHARS \
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz"
codeobject *
newcodeobject(argcount, nlocals, stacksize, flags,
code, consts, names, varnames, filename, name,
@ -237,7 +240,7 @@ newcodeobject(argcount, nlocals, stacksize, flags,
if (!is_stringobject(v))
continue;
p = getstringvalue(v);
if (strspn(p, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz")
if ((int)strspn(p, NAME_CHARS)
!= getstringsize(v))
continue;
PyString_InternInPlace(&PyTuple_GET_ITEM(consts, i));

3
Python/importdl.c
View file

@ -503,13 +503,16 @@ load_dynamic_module(name, pathname, fp)
perror(funcname);
}
#endif /* hpux */
#ifdef USE_SHLIB
got_it:
#endif
if (p == NULL) {
err_setstr(ImportError,
"dynamic module does not define init function");
return NULL;
}
(*p)();
/* XXX Need check for err_occurred() here */
m = dictlookup(import_modules, name);
if (m == NULL) {

2
Python/mystrtoul.c
View file

@ -141,7 +141,7 @@ int base;
*ptr = str;
if (ovf)
{
result = ~0;
result = (unsigned long) ~0L;
errno = ERANGE;
}
return result;

14
Python/structmember.c
View file

@ -186,7 +186,7 @@ setmember(addr, mlist, name, v)
err_badarg();
return -1;
}
*(char*)addr = getintvalue(v);
*(char*)addr = (char) getintvalue(v);
break;
case T_SHORT:
case T_USHORT:
@ -194,7 +194,7 @@ setmember(addr, mlist, name, v)
err_badarg();
return -1;
}
*(short*)addr = getintvalue(v);
*(short*)addr = (short) getintvalue(v);
break;
case T_UINT:
case T_INT:
@ -202,7 +202,7 @@ setmember(addr, mlist, name, v)
err_badarg();
return -1;
}
*(int*)addr = getintvalue(v);
*(int*)addr = (int) getintvalue(v);
break;
case T_LONG:
if (!is_intobject(v)) {
@ -223,9 +223,10 @@ setmember(addr, mlist, name, v)
break;
case T_FLOAT:
if (is_intobject(v))
*(float*)addr = getintvalue(v);
*(float*)addr = (float) getintvalue(v);
else if (is_floatobject(v))
*(float*)addr = getfloatvalue(v);
*(float*)addr =
(float) getfloatvalue(v);
else {
err_badarg();
return -1;
@ -233,7 +234,8 @@ setmember(addr, mlist, name, v)
break;
case T_DOUBLE:
if (is_intobject(v))
*(double*)addr = getintvalue(v);
*(double*)addr =
(double) getintvalue(v);
else if (is_floatobject(v))
*(double*)addr = getfloatvalue(v);
else {