diff options
| -rw-r--r-- | Include/ceval.h | 1 | ||||
| -rw-r--r-- | Include/longobject.h | 1 | ||||
| -rw-r--r-- | Include/node.h | 1 | ||||
| -rw-r--r-- | Include/pythonrun.h | 4 | ||||
| -rw-r--r-- | Modules/arraymodule.c | 3 | ||||
| -rw-r--r-- | Objects/longobject.c | 1 | ||||
| -rw-r--r-- | Objects/methodobject.c | 2 | ||||
| -rw-r--r-- | Parser/listnode.c | 1 | ||||
| -rw-r--r-- | Python/ceval.c | 1 | ||||
| -rw-r--r-- | Python/pythonrun.c | 9 |
10 files changed, 14 insertions, 10 deletions
diff --git a/Include/ceval.h b/Include/ceval.h index a6948f1114..1c830c3d44 100644 --- 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 7566a38439..1b048fd691 100644 --- 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 bfae7da054..84238df3e0 100644 --- 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 cc5bb05a92..e25a3de997 100644 --- 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 93c0735a65..00f2477f02 100644 --- 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 8c0b6c1c80..3e12639d7b 100644 --- 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 102e5772ac..0a56161d1b 100644 --- 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 a914bab236..d566e785c4 100644 --- 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 329494e7c4..324ecdf97f 100644 --- 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 6661a19297..56254ac285 100644 --- 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 */ |