diff options
| -rwxr-xr-x | Mac/Modules/carbonevt/_CarbonEvtmodule.c | 12 | ||||
| -rw-r--r-- | Mac/Modules/ctl/_Ctlmodule.c | 2 | ||||
| -rw-r--r-- | Modules/_ssl.c | 2 | ||||
| -rw-r--r-- | Modules/_struct.c | 2 | ||||
| -rw-r--r-- | Python/compile.c | 12 |
5 files changed, 4 insertions, 26 deletions
diff --git a/Mac/Modules/carbonevt/_CarbonEvtmodule.c b/Mac/Modules/carbonevt/_CarbonEvtmodule.c index 66e4e27..893beec 100755 --- a/Mac/Modules/carbonevt/_CarbonEvtmodule.c +++ b/Mac/Modules/carbonevt/_CarbonEvtmodule.c @@ -27,12 +27,6 @@ PyObject *EventHandlerCallRef_New(EventHandlerCallRef itself); PyObject *EventRef_New(EventRef itself); /********** EventTypeSpec *******/ -static PyObject* -EventTypeSpec_New(EventTypeSpec *in) -{ - return Py_BuildValue("ll", in->eventClass, in->eventKind); -} - static int EventTypeSpec_Convert(PyObject *v, EventTypeSpec *out) { @@ -67,12 +61,6 @@ HIPoint_Convert(PyObject *v, HIPoint *out) /********** EventHotKeyID *******/ -static PyObject* -EventHotKeyID_New(EventHotKeyID *in) -{ - return Py_BuildValue("ll", in->signature, in->id); -} - static int EventHotKeyID_Convert(PyObject *v, EventHotKeyID *out) { diff --git a/Mac/Modules/ctl/_Ctlmodule.c b/Mac/Modules/ctl/_Ctlmodule.c index d7d4d0a..cdb8557 100644 --- a/Mac/Modules/ctl/_Ctlmodule.c +++ b/Mac/Modules/ctl/_Ctlmodule.c @@ -1598,7 +1598,7 @@ static PyObject *CtlObj_GetBevelButtonMenuValue(ControlObject *_self, PyObject * { PyObject *_res = NULL; OSErr _err; - SInt16 outValue; + UInt16 outValue; #ifndef GetBevelButtonMenuValue PyMac_PRECHECK(GetBevelButtonMenuValue); #endif diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 4b0958a..643693e 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -667,7 +667,7 @@ _get_peer_alt_names (X509 *certificate) { char buf[2048]; char *vptr; int len; - const unsigned char *p; + unsigned char *p; if (certificate == NULL) return peer_alt_names; diff --git a/Modules/_struct.c b/Modules/_struct.c index b8f1525..a7fce10 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -182,6 +182,7 @@ get_long(PyObject *v, long *p) /* Same, but handling unsigned long */ +#ifndef PY_STRUCT_OVERFLOW_MASKING static int get_ulong(PyObject *v, unsigned long *p) { @@ -201,6 +202,7 @@ get_ulong(PyObject *v, unsigned long *p) } return 0; } +#endif /* PY_STRUCT_OVERFLOW_MASKING */ #ifdef HAVE_LONG_LONG diff --git a/Python/compile.c b/Python/compile.c index df12bde..00e0462 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -535,18 +535,6 @@ compiler_exit_scope(struct compiler *c) } -/* Allocate a new "anonymous" local variable. - Used by list comprehensions and with statements. -*/ - -static PyObject * -compiler_new_tmpname(struct compiler *c) -{ - char tmpname[256]; - PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]", ++c->u->u_tmpname); - return PyString_FromString(tmpname); -} - /* Allocate a new block and return a pointer to it. Returns NULL on error. */ |