I think the Sun compiler has chosen a perverse way to interpret

ANSI declarations combined with K&R definitions.  We'll
appease it a little bit.  But when it invades France, we fight.
* print.c (scm_iprlist): Change 'tlr' argument to an int.
* print.h (scm_iprlist): Here too.
* numbers.c (scm_divbigdig): Change definition to match
declaration in numbers.h.
* unif.c (scm_makflo): Change definition to match declaration in
unif.h.

diff --git a/libguile/numbers.c b/libguile/numbers.c
index 3605276..474fc4a 100644 (file)
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -998,11 +998,16 @@ scm_mulbig(x, nx, y, ny, sgn)
 }
 
 
+/* Sun's compiler complains about the fact that this function has an
+   ANSI prototype in numbers.h, but a K&R declaration here, and the
+   two specify different promotions for the third argument.  I'm going
+   to turn this into an ANSI declaration, and see if anyone complains
+   about it not being K&R.  */
+
 unsigned int
-scm_divbigdig(ds, h, div)
-     SCM_BIGDIG *ds;
-     scm_sizet h;
-     SCM_BIGDIG div;
+scm_divbigdig(SCM_BIGDIG *ds,
+             scm_sizet h,
+             SCM_BIGDIG div)
 {
   register unsigned long t2 = 0;
   while(h--) {

diff --git a/libguile/print.c b/libguile/print.c
index adc7048..e156226 100644 (file)
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -650,7 +650,7 @@ void
 scm_iprlist (hdr, exp, tlr, port, pstate)
      char *hdr;
      SCM exp;
-     char tlr;
+     int tlr;
      SCM port;
      scm_print_state *pstate;
 {

diff --git a/libguile/print.h b/libguile/print.h
index cb326fb..d16d4f6 100644 (file)
--- a/libguile/print.h
+++ b/libguile/print.h
@@ -88,7 +88,7 @@ SCM scm_make_print_state SCM_P ((void));
 void scm_free_print_state SCM_P ((SCM print_state));
 extern void scm_intprint SCM_P ((long n, int radix, SCM port));
 extern void scm_ipruk SCM_P ((char *hdr, SCM ptr, SCM port));
-extern void scm_iprlist SCM_P ((char *hdr, SCM exp, char tlr, SCM port, scm_print_state *pstate));
+extern void scm_iprlist SCM_P ((char *hdr, SCM exp, int tlr, SCM port, scm_print_state *pstate));
 extern void scm_prin1 SCM_P ((SCM exp, SCM port, int writingp));
 extern void scm_iprin1 SCM_P ((SCM exp, SCM port, scm_print_state *pstate));
 extern SCM scm_write SCM_P ((SCM obj, SCM port));

diff --git a/libguile/unif.c b/libguile/unif.c
index 9221017..87be8a2 100644 (file)
--- a/libguile/unif.c
+++ b/libguile/unif.c
@@ -174,8 +174,7 @@ scm_vector_set_length_x (vect, len)
 
 
 SCM 
-scm_makflo (x)
-     float x;
+scm_makflo (float x)
 {
   SCM z;
   if (x == 0.0)