* ceval.c, longobject.c, methodobject.c, listnode.c, arraymodule.c,

  pythonrun.c: added static forward declarations
* pythonrun.h, ceval.h, longobject.h, node.h: removed declarations of
  static routines

diff --git a/Include/ceval.h b/Include/ceval.h
index a6948f1114fbb320d27002a0bfdbf06531ff81e4..1c830c3d44eeca22ac2b7dac3c93ee4b63021c16 100644 (file)
--- a/Include/ceval.h
+++ b/Include/ceval.h
@@ -35,7 +35,6 @@ object *call_object PROTO((object *, object *));
 object *getglobals PROTO((void));
 object *getlocals PROTO((void));
 object *getowner PROTO((void));
-void mergelocals PROTO((void));
 
 void printtraceback PROTO((object *));
 void flushline PROTO((void));

diff --git a/Include/longobject.h b/Include/longobject.h
index 7566a384390a3d697cdb6969d7ab24b65b8851ba..1b048fd69108ef01c648ce9840a972b352492c8f 100644 (file)
--- a/Include/longobject.h
+++ b/Include/longobject.h
@@ -41,7 +41,6 @@ extern object *dnewlongobject PROTO((double));
 extern long getlongvalue PROTO((object *));
 extern double dgetlongvalue PROTO((object *));
 
-object *long_format PROTO((object *, int));
 object *long_scan PROTO((char *, int));
 
 #ifdef __cplusplus

diff --git a/Include/node.h b/Include/node.h
index bfae7da054be391d07ab746b1c818758702c79c8..84238df3e0e33c944d5b481709434c088df45073 100644 (file)
--- a/Include/node.h
+++ b/Include/node.h
@@ -61,7 +61,6 @@ extern void freetree PROTO((node *n));
 #endif
 
 extern void listtree PROTO((node *));
-extern void listnode PROTO((FILE *, node *));
 
 #ifdef __cplusplus
 }

diff --git a/Include/pythonrun.h b/Include/pythonrun.h
index cc5bb05a92ea6fc8fae4cce072b6a5652506f01f..e25a3de99732d49928c241c96112ed5ec13e0bcd 100644 (file)
--- a/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@ -42,12 +42,8 @@ int run_tty_loop PROTO((FILE *, char *));
 int parse_string PROTO((char *, int, struct _node **));
 int parse_file PROTO((FILE *, char *, int, struct _node **));
 
-object *eval_node PROTO((struct _node *, char *, object *, object *));
-
 object *run_string PROTO((char *, int, object *, object *));
 object *run_file PROTO((FILE *, char *, int, object *, object *));
-object *run_err_node PROTO((int, struct _node *, char *, object *, object *));
-object *run_node PROTO((struct _node *, char *, object *, object *));
 
 object *compile_string PROTO((char *, char *, int));
 

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 93c0735a65364fed27ef59f8c1b43d65e15ed15f..00f2477f026585cc6227f393a621fa619b272cb8 100644 (file)
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -66,10 +66,11 @@ extern typeobject Arraytype;
 
 #define is_arrayobject(op) ((op)->ob_type == &Arraytype)
 
+/* Forward */
 extern object *newarrayobject PROTO((int, struct arraydescr *));
 extern int getarraysize PROTO((object *));
 extern object *getarrayitem PROTO((object *, int));
-extern int setarrayitem PROTO((object *, int, object *));
+static int setarrayitem PROTO((object *, int, object *));
 extern int insarrayitem PROTO((object *, int, object *));
 extern int addarrayitem PROTO((object *, object *));
 

diff --git a/Objects/longobject.c b/Objects/longobject.c
index 8c0b6c1c80b678a3402b0585756e0e3721f821bc..3e12639d7b1c02e29f803517f3beb32aa1d36f5d 100644 (file)
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -39,6 +39,7 @@ static longobject *long_normalize PROTO((longobject *));
 static longobject *mul1 PROTO((longobject *, wdigit));
 static longobject *muladd1 PROTO((longobject *, wdigit, wdigit));
 static longobject *divrem1 PROTO((longobject *, wdigit, digit *));
+static object *long_format PROTO((object *aa, int base));
 
 static int ticker;     /* XXX Could be shared with ceval? */
 

diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index 102e5772ac7aabb06b12254e100f4e88ff157ae1..0a56161d1b7e9b13e62bbb35c037f6e5a51a03ee 100644 (file)
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -161,7 +161,7 @@ typeobject Methodtype = {
        meth_hash,      /*tp_hash*/
 };
 
-object *listmethods PROTO((struct methodlist *)); /* Forward */
+static object *listmethods PROTO((struct methodlist *)); /* Forward */
 
 static object *
 listmethods(ml)

diff --git a/Parser/listnode.c b/Parser/listnode.c
index a914bab23620005c5b1a1453bab79586341890d8..d566e785c42c6a3a6cd2c49089952f3ffaec3620 100644 (file)
--- a/Parser/listnode.c
+++ b/Parser/listnode.c
@@ -30,6 +30,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* Forward */
 static void list1node PROTO((FILE *, node *));
+static void listnode PROTO((FILE *, node *));
 
 void
 listtree(n)

diff --git a/Python/ceval.c b/Python/ceval.c
index 329494e7c4ace44ca50d80d32a6a1d4d8a781d02..324ecdf97f79b8e2841825af54747734c371c03f 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -94,6 +94,7 @@ static void locals_2_fast PROTO((frameobject *, int));
 static void fast_2_locals PROTO((frameobject *));
 static int access_statement PROTO((object *, object *, frameobject *));
 static int exec_statement PROTO((object *, object *, object *));
+static void mergelocals PROTO(());
 
 
 /* Pointer to current frame, used to link new frames to */

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 6661a19297d1bc996b0c0a54d0ca6c42b3d98340..56254ac285d69566f7c72502167dc976164e5bd3 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -51,7 +51,14 @@ extern char *getpythonpath();
 
 extern grammar gram; /* From graminit.c */
 
-void initsigs(); /* Forward */
+/* Forward */
+static object *run_err_node PROTO((int err, node *n, char *filename,
+                                  object *globals, object *locals));
+static object *run_node PROTO((node *n, char *filename,
+                              object *globals, object *locals));
+static object *eval_node PROTO((node *n, char *filename,
+                               object *globals, object *locals));
+void initsigs PROTO(());
 
 int debugging; /* Needed by parser.c */
 int verbose; /* Needed by import.c */