Keep gcc -Wall happy

diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
index e951bc409523544592760f74fdbdff53467958c0..8f7407f52ab0053c03a2c25f06f813ebfe9f8ca2 100644 (file)
--- 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 8a638c7b78dec70acc13beb11e44ae8dfaab50a2..83e7b07ecdbc706b011526b1d692511863f2f51a 100644 (file)
--- 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 f36647e177d8f87a4ceb5c0309c2a6db15efe8ef..13ef95e2d85b4b98ae089d4da423324a4d018a8c 100644 (file)
--- 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 d5a398b0759b3f46e2fb6b37b817e8de4607d56a..755033c9ba595a1780ac411fdbfb5524a871a320 100644 (file)
--- 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 2368143c6378b1847b78e326750660feecb04645..fe24b2816f3536e7062233af9d81e429af1839be 100644 (file)
--- 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;