diff options
author | Jim Blandy <jimb@red-bean.com> | 1996-09-11 20:29:44 +0000 |
---|---|---|
committer | Jim Blandy <jimb@red-bean.com> | 1996-09-11 20:29:44 +0000 |
commit | 5e840c2e1a254791505d78bef0c041369f488303 (patch) | |
tree | bed46a94b5e87e638aa5bd39a5aebd9c01c81855 | |
parent | 3a2425b94404345deb466c3b4dbac04dd82b47f4 (diff) | |
download | guile-5e840c2e1a254791505d78bef0c041369f488303.tar.gz |
* numbers.h: Repeated declarations removed.
* ports.h (scm_close_all_ports_except): Declaration for the
function defined in ports.c added.
* posix.h: Missing declarations added.
* procs.h (scm_make_subr_opt): Missing declaration added.
* socket.h (scm_sys_gethost): Missing declaration added.
* socket.h: Redundant declarations removed (they are in fdsocket.h).
* srcprop.h (scm_set_source_property_x, scm_finish_srcprop):
Missing declarations added.
* stime.h (scm_get_internal_real_time): Repeated declarations removed.
* struct.c: Uninitialized variable `SCM answer' may be used.
* unif.c (l2ra): Declaration prototype.
* unif.c (scm_array_equal_p): Dummy definition removed (it is
defined in ramap.c).
* unif.h (scm_raprin1, scm_istr2bve, scm_array_equal_p):
Redundant declarations removed (they are in ramap.h).
* variable.h (scm_make_udvariable,
scm_make_undefined_variable): Declaration corrected to
correspond variable.c.
* vectors.h (scm_vector_move_left_x, scm_vector_move_right_x):
Missing declarations added.
-rw-r--r-- | libguile/numbers.h | 6 | ||||
-rw-r--r-- | libguile/ports.h | 2 | ||||
-rw-r--r-- | libguile/posix.h | 12 | ||||
-rw-r--r-- | libguile/procs.h | 2 | ||||
-rw-r--r-- | libguile/socket.h | 35 | ||||
-rw-r--r-- | libguile/srcprop.h | 4 | ||||
-rw-r--r-- | libguile/stime.h | 4 | ||||
-rw-r--r-- | libguile/struct.c | 2 | ||||
-rw-r--r-- | libguile/unif.c | 17 | ||||
-rw-r--r-- | libguile/unif.h | 6 | ||||
-rw-r--r-- | libguile/variable.h | 4 | ||||
-rw-r--r-- | libguile/vectors.h | 6 |
12 files changed, 35 insertions, 65 deletions
diff --git a/libguile/numbers.h b/libguile/numbers.h index 170eeda98..b343d3653 100644 --- a/libguile/numbers.h +++ b/libguile/numbers.h @@ -240,11 +240,6 @@ extern SCM scm_logior(SCM n1, SCM n2); extern SCM scm_logxor(SCM n1, SCM n2); extern SCM scm_logtest(SCM n1, SCM n2); extern SCM scm_logbit_p(SCM n1, SCM n2); -extern SCM scm_logand(SCM n1, SCM n2); -extern SCM scm_logior(SCM n1, SCM n2); -extern SCM scm_logxor(SCM n1, SCM n2); -extern SCM scm_logtest(SCM n1, SCM n2); -extern SCM scm_logbit_p(SCM n1, SCM n2); extern SCM scm_lognot(SCM n); extern SCM scm_integer_expt(SCM z1, SCM z2); extern SCM scm_ash(SCM n, SCM cnt); @@ -273,7 +268,6 @@ extern SCM scm_number_to_string(SCM x, SCM radix); extern int scm_floprint(SCM sexp, SCM port, int writing); extern int scm_bigprint(SCM exp, SCM port, int writing); extern SCM scm_istr2int(char *str, long len, long radix); -extern SCM scm_istr2int(char *str, long len, long radix); extern SCM scm_istr2flo(char *str, long len, long radix); extern SCM scm_istring2number(char *str, long len, long radix); extern SCM scm_string_to_number(SCM str, SCM radix); diff --git a/libguile/ports.h b/libguile/ports.h index be25a9d24..f38b8c050 100644 --- a/libguile/ports.h +++ b/libguile/ports.h @@ -178,6 +178,7 @@ extern int scm_revealed_count (SCM port); extern SCM scm_port_revealed (SCM port); extern SCM scm_set_port_revealed_x (SCM port, SCM rcount); extern SCM scm_close_port (SCM port); +extern SCM scm_close_all_ports_except (SCM ports); extern SCM scm_input_port_p (SCM x); extern SCM scm_output_port_p (SCM x); extern SCM scm_eof_object_p (SCM x); @@ -214,6 +215,7 @@ extern int scm_revealed_count (); extern SCM scm_port_revealed (); extern SCM scm_set_port_revealed_x (); extern SCM scm_close_port (); +extern SCM scm_close_all_ports_except (); extern SCM scm_input_port_p (); extern SCM scm_output_port_p (); extern SCM scm_eof_object_p (); diff --git a/libguile/posix.h b/libguile/posix.h index 65b6c7711..904cc6236 100644 --- a/libguile/posix.h +++ b/libguile/posix.h @@ -51,8 +51,14 @@ #ifdef __STDC__ +extern SCM scm_tcsetpgrp (SCM port, SCM pgid); +extern SCM scm_tcgetpgrp (SCM port); +extern SCM scm_ctermid (void); +extern SCM scm_setsid (void); +extern SCM scm_setpgid (SCM pid, SCM pgid); extern SCM scm_sys_pipe (void); extern SCM scm_sys_getgroups(void); +extern SCM scm_getpgrp (void); extern SCM scm_sys_getpwuid (SCM user); extern SCM scm_setpwent (SCM arg); extern SCM scm_sys_getgrgid (SCM name); @@ -93,8 +99,14 @@ extern SCM scm_sync(void); extern void scm_init_posix (void); #else /* STDC */ +extern SCM scm_tcsetpgrp (); +extern SCM scm_tcgetpgrp (); +extern SCM scm_ctermid (); +extern SCM scm_setsid (); +extern SCM scm_setpgid (); extern SCM scm_sys_pipe (); extern SCM scm_sys_getgroups(); +extern SCM scm_getpgrp (); extern SCM scm_sys_getpwuid (); extern SCM scm_setpwent (); extern SCM scm_sys_getgrgid (); diff --git a/libguile/procs.h b/libguile/procs.h index d2dc9bcfa..d1fa58016 100644 --- a/libguile/procs.h +++ b/libguile/procs.h @@ -91,6 +91,7 @@ typedef struct scm_dsubr #ifdef __STDC__ extern SCM scm_make_subr (char *name, int type, SCM (*fcn) ()); +extern SCM scm_make_subr_opt (char *name, int type, SCM (*fcn) (), int set); extern SCM scm_makcclo (SCM proc, long len); extern SCM scm_procedure_p (SCM obj); extern void scm_init_iprocs(scm_iproc *subra, int type); @@ -98,6 +99,7 @@ extern void scm_init_procs (void); #else /* STDC */ extern SCM scm_make_subr (); +extern SCM scm_make_subr_opt (); extern SCM scm_makcclo (); extern SCM scm_procedure_p (); extern void scm_init_iprocs(); diff --git a/libguile/socket.h b/libguile/socket.h index c4b082ab2..95b4ea749 100644 --- a/libguile/socket.h +++ b/libguile/socket.h @@ -51,6 +51,7 @@ #ifdef __STDC__ +extern SCM scm_sys_gethost (SCM name); extern SCM scm_sys_inet_aton (SCM address); extern SCM scm_inet_ntoa (SCM inetid); extern SCM scm_inet_netof (SCM address); @@ -63,26 +64,10 @@ extern SCM scm_sethost (SCM arg); extern SCM scm_setnet (SCM arg); extern SCM scm_setproto (SCM arg); extern SCM scm_setserv (SCM arg); -extern SCM scm_sys_socket (SCM family, SCM style, SCM proto); -extern SCM scm_sys_socketpair (SCM family, SCM style, SCM proto); - -extern SCM scm_sys_getsockopt (SCM port, SCM level, SCM optname); -extern SCM scm_sys_setsockopt (SCM port, SCM level, SCM optname, SCM value); -extern SCM scm_sys_shutdown (SCM port, SCM how); -extern SCM scm_sys_connect (SCM sockpt, SCM fam, SCM address, SCM args); -extern SCM scm_sys_bind (SCM sockpt, SCM fam, SCM address); -extern SCM scm_sys_listen (SCM port, SCM backlog); -extern void scm_init_addr_buffer (void); -extern SCM scm_sys_accept (SCM sockpt); -extern SCM scm_sys_getsockname (SCM sockpt); -extern SCM scm_sys_getpeername (SCM sockpt); -extern SCM scm_sys_recv (SCM sockpt, SCM buff_or_size, SCM flags); -extern SCM scm_sys_send (SCM sockpt, SCM message, SCM flags); -extern SCM scm_sys_recvfrom (SCM sockpt, SCM buff_or_size, SCM flags); -extern SCM scm_sys_sendto (SCM sockpt, SCM message, SCM fam, SCM address, SCM args_and_flags); extern void scm_init_socket (void); #else /* STDC */ +extern SCM scm_sys_gethost (); extern SCM scm_sys_inet_aton (); extern SCM scm_inet_ntoa (); extern SCM scm_inet_netof (); @@ -95,22 +80,6 @@ extern SCM scm_sethost (); extern SCM scm_setnet (); extern SCM scm_setproto (); extern SCM scm_setserv (); -extern SCM scm_sys_socket (); -extern SCM scm_sys_socketpair (); -extern SCM scm_sys_getsockopt (); -extern SCM scm_sys_setsockopt (); -extern SCM scm_sys_shutdown (); -extern SCM scm_sys_connect (); -extern SCM scm_sys_bind (); -extern SCM scm_sys_listen (); -extern void scm_init_addr_buffer (); -extern SCM scm_sys_accept (); -extern SCM scm_sys_getsockname (); -extern SCM scm_sys_getpeername (); -extern SCM scm_sys_recv (); -extern SCM scm_sys_send (); -extern SCM scm_sys_recvfrom (); -extern SCM scm_sys_sendto (); extern void scm_init_socket (); #endif /* STDC */ diff --git a/libguile/srcprop.h b/libguile/srcprop.h index d57a8aaa3..641cc3307 100644 --- a/libguile/srcprop.h +++ b/libguile/srcprop.h @@ -116,15 +116,19 @@ typedef struct scm_srcprops_chunk extern SCM scm_srcprops_to_plist (SCM obj); extern SCM _scm_make_srcprops (int line, int col, SCM fname, SCM copy, SCM plist); extern SCM scm_source_property (SCM obj, SCM key); +extern SCM scm_set_source_property_x (SCM obj, SCM key, SCM datum); extern SCM scm_source_properties (SCM obj); extern SCM scm_set_source_properties_x (SCM obj, SCM props); +extern void scm_finish_srcprop (void); extern void scm_init_srcprop (void); #else extern SCM scm_srcprops_to_plist (); extern SCM _scm_make_srcprops (); extern SCM scm_source_property (); +extern SCM scm_set_source_property_x (); extern SCM scm_source_properties (); extern SCM scm_set_source_properties_x (); +extern void scm_finish_srcprop (); extern void scm_init_srcprop (); #endif diff --git a/libguile/stime.h b/libguile/stime.h index 6353fa461..8b6180654 100644 --- a/libguile/stime.h +++ b/libguile/stime.h @@ -49,8 +49,6 @@ #ifdef __STDC__ extern SCM scm_get_internal_real_time(void); -extern SCM scm_get_internal_real_time(void); -extern SCM scm_get_internal_real_time(void); extern SCM scm_get_internal_run_time(void); extern SCM scm_current_time(void); extern long scm_time_in_msec(long x); @@ -58,8 +56,6 @@ extern void scm_init_stime(void); #else /* STDC */ extern SCM scm_get_internal_real_time(); -extern SCM scm_get_internal_real_time(); -extern SCM scm_get_internal_real_time(); extern SCM scm_get_internal_run_time(); extern SCM scm_current_time(); extern long scm_time_in_msec(); diff --git a/libguile/struct.c b/libguile/struct.c index 1c280c7c4..ca6b324d9 100644 --- a/libguile/struct.c +++ b/libguile/struct.c @@ -366,7 +366,7 @@ scm_struct_ref (handle, pos) SCM pos; #endif { - SCM answer; + SCM answer = SCM_UNDEFINED; SCM * data; SCM layout; int p; diff --git a/libguile/unif.c b/libguile/unif.c index 81df53a2f..e1926fe15 100644 --- a/libguile/unif.c +++ b/libguile/unif.c @@ -2170,7 +2170,11 @@ scm_array_to_list (v) static char s_bad_ralst[] = "Bad scm_array contents scm_list"; +#ifdef __STDC__ +static int l2ra (SCM lst, SCM ra, scm_sizet base, scm_sizet k); +#else static int l2ra (); +#endif SCM_PROC(s_list_to_uniform_array, "list->uniform-array", 3, 0, 0, scm_list_to_uniform_array); #ifdef __STDC__ @@ -2671,19 +2675,6 @@ scm_istr2bve (str, len) return SCM_BOOL_F; } -#ifdef __STDC__ -SCM -scm_array_equal_p (SCM ra0, SCM ra1) -#else -SCM -scm_array_equal_p (ra0, ra1) - SCM ra0; - SCM ra1; -#endif -{ - return SCM_BOOL_F; -} - void scm_init_unif () { diff --git a/libguile/unif.h b/libguile/unif.h index 324a3008d..6d2dc4df8 100644 --- a/libguile/unif.h +++ b/libguile/unif.h @@ -110,9 +110,6 @@ extern SCM scm_list_to_uniform_array (SCM ndim, SCM prot, SCM lst); extern int scm_raprin1 (SCM exp, SCM port, int writing); extern SCM scm_array_prototype (SCM ra); extern void scm_init_unif (void); -extern int scm_raprin1 (SCM exp, SCM port, int writing); -extern SCM scm_istr2bve (char *str, long len); -extern SCM scm_array_equal_p (SCM ra0, SCM ra1); #else /* STDC */ extern SCM scm_vector_set_length_x (); @@ -151,9 +148,6 @@ extern SCM scm_list_to_uniform_array (); extern int scm_raprin1 (); extern SCM scm_array_prototype (); extern void scm_init_unif (); -extern int scm_raprin1 (); -extern SCM scm_istr2bve (); -extern SCM scm_array_equal_p (); #endif /* STDC */ diff --git a/libguile/variable.h b/libguile/variable.h index 1bd92846c..9b426bc4e 100644 --- a/libguile/variable.h +++ b/libguile/variable.h @@ -60,7 +60,7 @@ extern int scm_tc16_variable; #ifdef __STDC__ extern SCM scm_make_variable (SCM init, SCM name_hint); -extern SCM scm_make_udvariable (SCM name_hint); +extern SCM scm_make_undefined_variable (SCM name_hint); extern SCM scm_variable_p (SCM obj); extern SCM scm_variable_ref (SCM var); extern SCM scm_variable_set_x (SCM var, SCM val); @@ -70,7 +70,7 @@ extern void scm_init_variable (void); #else /* STDC */ extern SCM scm_make_variable (); -extern SCM scm_make_udvariable (); +extern SCM scm_make_undefined_variable (); extern SCM scm_variable_p (); extern SCM scm_variable_ref (); extern SCM scm_variable_set_x (); diff --git a/libguile/vectors.h b/libguile/vectors.h index 52b6c9c5b..4315224c8 100644 --- a/libguile/vectors.h +++ b/libguile/vectors.h @@ -64,6 +64,10 @@ extern SCM scm_make_vector(SCM k, SCM fill, SCM multi); extern SCM scm_vector_to_list(SCM v); extern SCM scm_vector_fill_x(SCM v, SCM fill_x); extern SCM scm_vector_equal_p(SCM x, SCM y); +extern SCM scm_vector_move_left_x (SCM vec1, SCM start1, SCM end1, SCM + vec2, SCM start2); +extern SCM scm_vector_move_right_x (SCM vec1, SCM start1, SCM end1, SCM + vec2, SCM start2); extern void scm_init_vectors (void); #else /* STDC */ @@ -76,6 +80,8 @@ extern SCM scm_make_vector(); extern SCM scm_vector_to_list(); extern SCM scm_vector_fill_x(); extern SCM scm_vector_equal_p(); +extern SCM scm_vector_move_left_x (); +extern SCM scm_vector_move_right_x (); extern void scm_init_vectors (); #endif /* STDC */ |