diff options
| -rw-r--r-- | Modules/fcntlmodule.c | 1 | ||||
| -rw-r--r-- | Modules/python.c | 1 | ||||
| -rw-r--r-- | Modules/reopmodule.c | 2 | ||||
| -rw-r--r-- | Python/frozenmain.c | 4 | ||||
| -rw-r--r-- | Python/import.c | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c index e951bc4..8f7407f 100644 --- a/Modules/fcntlmodule.c +++ b/Modules/fcntlmodule.c @@ -279,6 +279,7 @@ all_ins(d) if (ins(d, "LOCK_EX", (long)LOCK_EX)) return -1; if (ins(d, "LOCK_NB", (long)LOCK_NB)) return -1; if (ins(d, "LOCK_UN", (long)LOCK_UN)) return -1; + return 0; } void diff --git a/Modules/python.c b/Modules/python.c index 8a638c7..83e7b07 100644 --- a/Modules/python.c +++ b/Modules/python.c @@ -2,6 +2,7 @@ extern int Py_Main(); +int main(argc, argv) int argc; char **argv; diff --git a/Modules/reopmodule.c b/Modules/reopmodule.c index f36647e..13ef95e 100644 --- a/Modules/reopmodule.c +++ b/Modules/reopmodule.c @@ -62,8 +62,6 @@ static PyObject *ReopError; /* Exception */ #define BEGINNING_OF_BUFFER 7 #define END_OF_BUFFER 8 -static unsigned char *reop_casefold; - static PyObject * makeresult(regs, num_regs) struct re_registers *regs; diff --git a/Python/frozenmain.c b/Python/frozenmain.c index d5a398b..755033c 100644 --- a/Python/frozenmain.c +++ b/Python/frozenmain.c @@ -77,6 +77,6 @@ Py_FrozenMain(argc, argv) if (inspect && isatty((int)fileno(stdin))) sts = PyRun_AnyFile(stdin, "<stdin>") != 0; - Py_Exit(sts); - /*NOTREACHED*/ + Py_Finalize(); + return sts; } diff --git a/Python/import.c b/Python/import.c index 2368143..fe24b28 100644 --- a/Python/import.c +++ b/Python/import.c @@ -692,7 +692,6 @@ static int init_builtin(name) char *name; { - PyInterpreterState *interp = PyThreadState_Get()->interp; struct _inittab *p; PyObject *mod; |