*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 48adfbb..4aae1d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-10-2  Greg J. Badros  <gjb@cs.washington.edu>
+
+       * NEWS: More complete description for --enable-debug-freelist.
+
 1999-12-09  Gary Houston  <ghouston@freewire.co.uk>
 
        * configure.in (CFLAGS): don't add -Wpointer-arith, since it
@@ -55,7 +59,7 @@
 
        * acconfig.h (HAVE_POSIX, HAVE_NETWORKING): Add comments.
 
-Mon Sep 27 16:28:33 1999  Greg J. Badros  <gjb@cs.washington.edu>
+1999-09-27  Greg J. Badros  <gjb@cs.washington.edu>
 
        * configure.in:  Added --enable-debug-freelist option.
 

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index b49dbd7..03db838 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,20 @@
+1999-12-09  Greg J. Badros  <gjb@cs.washington.edu>
+
+       * strports.h, strports.c (scm_eval_0str): Fix constness.  Some
+       thanks to Dirk Hermann.
+
+       * gh_eval.c (gh_eval_str, gh_eval_file, gh_eval_str_with_catch,
+       gh_eval_str_with_standard_handler,
+       gh_eval_str_with_stack_saving_handler): Fix constness.  Some
+       thanks to Dirk Hermann.
+
+       * gh_data.c (gh_str02scm): Fix constness.
+
+       * gh.h: Fix constness of prototypes for the above.
+
+       * vectors.c: Include "unif.h" to avoid a warning about missing
+       prototype for scm_uniform_element_size().
+
 1999-12-09  Mikael Djurfeldt  <mdj@mdj.nada.kth.se>
 
        * vectors.c (scm_vector_length, scm_vector_ref, scm_vector_set_x):

diff --git a/libguile/gh.h b/libguile/gh.h
index 444942a..4a8e7a1 100644 (file)
--- a/libguile/gh.h
+++ b/libguile/gh.h
@@ -67,15 +67,15 @@ SCM gh_catch(SCM tag, scm_catch_body_t body, void *body_data,
 
 SCM gh_standard_handler(void *data, SCM tag, SCM throw_args);
 
-SCM gh_eval_str(char *scheme_code);
-SCM gh_eval_str_with_catch(char *scheme_code, scm_catch_handler_t handler);
-SCM gh_eval_str_with_standard_handler(char *scheme_code);
-SCM gh_eval_str_with_stack_saving_handler(char *scheme_code);
+SCM gh_eval_str(const char *scheme_code);
+SCM gh_eval_str_with_catch(const char *scheme_code, scm_catch_handler_t handler);
+SCM gh_eval_str_with_standard_handler(const char *scheme_code);
+SCM gh_eval_str_with_stack_saving_handler(const char *scheme_code);
 
-SCM gh_eval_file(char *fname);
+SCM gh_eval_file(const char *fname);
 #define gh_load(fname) gh_eval_file(fname)
-SCM gh_eval_file_with_catch(char *scheme_code, scm_catch_handler_t handler);
-SCM gh_eval_file_with_standard_handler(char *scheme_code);
+SCM gh_eval_file_with_catch(const char *scheme_code, scm_catch_handler_t handler);
+SCM gh_eval_file_with_standard_handler(const char *scheme_code);
 
 #define gh_defer_ints() SCM_DEFER_INTS
 #define gh_allow_ints() SCM_ALLOW_INTS
@@ -104,7 +104,7 @@ SCM gh_long2scm(long x);
 SCM gh_double2scm(double x);
 SCM gh_char2scm(char c);
 SCM gh_str2scm(char *s, int len);
-SCM gh_str02scm(char *s);
+SCM gh_str02scm(const char *s);
 void gh_set_substr(char *src, SCM dst, int start, int len);
 SCM gh_symbol2scm(const char *symbol_str);
 SCM gh_ints2scm(int *d, int n);

diff --git a/libguile/gh_data.c b/libguile/gh_data.c
index 9c21042..d8bc87b 100644 (file)
--- a/libguile/gh_data.c
+++ b/libguile/gh_data.c
@@ -87,7 +87,7 @@ gh_str2scm (char *s, int len)
   return scm_makfromstr (s, len, 0);
 }
 SCM 
-gh_str02scm (char *s)
+gh_str02scm (const char *s)
 {
   return scm_makfrom0str (s);
 }

diff --git a/libguile/gh_eval.c b/libguile/gh_eval.c
index 9931dbe..468434a 100644 (file)
--- a/libguile/gh_eval.c
+++ b/libguile/gh_eval.c
@@ -50,14 +50,14 @@ typedef SCM (*gh_eval_t) (void *data, SCM jmpbuf);
 
 /* Evaluate the string; toss the value.  */
 SCM
-gh_eval_str (char *scheme_code)
+gh_eval_str (const char *scheme_code)
 {
   return scm_eval_0str (scheme_code);
 }
 
 /* evaluate the file by passing it to the lower level scm_primitive_load() */
 SCM
-gh_eval_file (char *fname)
+gh_eval_file (const char *fname)
 {
   return scm_primitive_load (gh_str02scm (fname));
 }
@@ -72,28 +72,28 @@ eval_str_wrapper (void *data)
 }
 
 SCM
-gh_eval_str_with_catch (char *scheme_code, scm_catch_handler_t handler)
+gh_eval_str_with_catch (const char *scheme_code, scm_catch_handler_t handler)
 {
   /* FIXME: not there yet */
-  return gh_catch (SCM_BOOL_T, (scm_catch_body_t) eval_str_wrapper, scheme_code,
-                  (scm_catch_handler_t) handler, scheme_code);
+  return gh_catch (SCM_BOOL_T, (scm_catch_body_t) eval_str_wrapper, (void *) scheme_code,
+                  (scm_catch_handler_t) handler, (void *) scheme_code);
 }
 
 SCM
-gh_eval_str_with_standard_handler (char *scheme_code)
+gh_eval_str_with_standard_handler (const char *scheme_code)
 {
   return gh_eval_str_with_catch (scheme_code, gh_standard_handler);
 }
 
 SCM
-gh_eval_str_with_stack_saving_handler (char *scheme_code)
+gh_eval_str_with_stack_saving_handler (const char *scheme_code)
 {
   return scm_internal_stack_catch (SCM_BOOL_T,
                                   (scm_catch_body_t) eval_str_wrapper,
-                                  scheme_code,
+                                  (void *) scheme_code,
                                   (scm_catch_handler_t)
                                   gh_standard_handler,
-                                  scheme_code);
+                                  (void *) scheme_code);
 }
 
 static SCM
@@ -106,16 +106,16 @@ eval_file_wrapper (void *data)
 }
 
 SCM
-gh_eval_file_with_catch (char *scheme_code, scm_catch_handler_t handler)
+gh_eval_file_with_catch (const char *scheme_code, scm_catch_handler_t handler)
 {
   /* FIXME: not there yet */
   return gh_catch (SCM_BOOL_T, (scm_catch_body_t) eval_file_wrapper,
-                  scheme_code, (scm_catch_handler_t) handler,
-                  scheme_code);
+                  (void *) scheme_code, (scm_catch_handler_t) handler,
+                  (void *) scheme_code);
 }
 
 SCM
-gh_eval_file_with_standard_handler (char *scheme_code)
+gh_eval_file_with_standard_handler (const char *scheme_code)
 {
   return gh_eval_file_with_catch (scheme_code, gh_standard_handler);
 }

diff --git a/libguile/strports.c b/libguile/strports.c
index 19e2ba1..9d52b11 100644 (file)
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -371,8 +371,7 @@ scm_read_0str (expr)
 /* Given a null-terminated string EXPR containing Scheme program text,
    evaluate it, and return the result of the last expression evaluated.  */
 SCM
-scm_eval_0str (expr)
-     char *expr;
+scm_eval_0str (const char *expr)
 {
   return scm_eval_string (scm_makfrom0str (expr));
 }

diff --git a/libguile/strports.h b/libguile/strports.h
index d87f8d3..302a88c 100644 (file)
--- a/libguile/strports.h
+++ b/libguile/strports.h
@@ -54,7 +54,7 @@ extern SCM scm_call_with_output_string SCM_P ((SCM proc));
 extern SCM scm_strprint_obj SCM_P ((SCM obj));
 extern SCM scm_call_with_input_string SCM_P ((SCM str, SCM proc));
 extern SCM scm_read_0str SCM_P ((char *expr));
-extern SCM scm_eval_0str SCM_P ((char *expr));
+extern SCM scm_eval_0str SCM_P ((const char *expr));
 extern SCM scm_eval_string SCM_P ((SCM string));
 extern void scm_init_strports SCM_P ((void));
 

diff --git a/libguile/vectors.c b/libguile/vectors.c
index 4c1b490..52af1cf 100644 (file)
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -45,6 +45,7 @@
 #include "eq.h"
 
 #include "vectors.h"
+#include "unif.h"
 \f
 
 /*