guile/guile-core/guile-readline readline.h read...

[Marius Vollmer]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Marius Vollmer <address@hidden> 01/06/14 12:51:54

Modified files:
        guile-core/guile-readline: readline.h readline.c 

Log message:
        Replace "scm_*_t" with "scm_t_*".

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/guile-readline/readline.h.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/guile-readline/readline.c.diff?cvsroot=OldCVS&tr1=1.36&tr2=1.37&r1=text&r2=text

Patches:
Index: guile/guile-core/guile-readline/readline.c
diff -u guile/guile-core/guile-readline/readline.c:1.36 
guile/guile-core/guile-readline/readline.c:1.37
--- guile/guile-core/guile-readline/readline.c:1.36     Thu Jun 14 10:42:20 2001
+++ guile/guile-core/guile-readline/readline.c  Thu Jun 14 12:51:54 2001
@@ -42,7 +42,7 @@
 #include "libguile/validate.h"
 #include "guile-readline/readline.h"
 
-scm_option_t scm_readline_opts[] = {
+scm_t_option scm_readline_opts[] = {
   { SCM_OPTION_BOOLEAN, "history-file", 1,
     "Use history file." },
   { SCM_OPTION_INTEGER, "history-length", 200,
@@ -147,7 +147,7 @@
 
 static int in_readline = 0;
 #ifdef USE_THREADS
-static scm_mutex_t reentry_barrier_mutex;
+static scm_t_mutex reentry_barrier_mutex;
 #endif
 
 static SCM internal_readline (SCM text);
@@ -207,7 +207,7 @@
   scm_readline_init_ports (inp, outp);
 
   ans = scm_internal_catch (SCM_BOOL_T,
-                           (scm_catch_body_t) internal_readline,
+                           (scm_t_catch_body) internal_readline,
                            (void *) SCM_UNPACK (text),
                            handle_error, 0);
 
@@ -225,7 +225,7 @@
 {
   int reentryp = 0;
 #ifdef USE_THREADS
-  /* We should rather use scm_mutex_try_lock when it becomes available */
+  /* We should rather use scm_t_mutexry_lock when it becomes available */
   scm_mutex_lock (&reentry_barrier_mutex);
 #endif
   if (in_readline)
@@ -277,7 +277,7 @@
   int fd;
   FILE *f;
 
-  fd = dup (((struct scm_fport_t *) SCM_STREAM (port))->fdes);
+  fd = dup (((struct scm_t_fport *) SCM_STREAM (port))->fdes);
   if (fd == -1)
     {
       --in_readline;
Index: guile/guile-core/guile-readline/readline.h
diff -u guile/guile-core/guile-readline/readline.h:1.8 
guile/guile-core/guile-readline/readline.h:1.9
--- guile/guile-core/guile-readline/readline.h:1.8      Thu Jun 14 10:41:51 2001
+++ guile/guile-core/guile-readline/readline.h  Thu Jun 14 12:51:54 2001
@@ -22,7 +22,7 @@
 
 #include "libguile/__scm.h"
 
-extern scm_option_t scm_readline_opts[];
+extern scm_t_option scm_readline_opts[];
 
 #define SCM_HISTORY_FILE_P     scm_readline_opts[0].val
 #define SCM_HISTORY_LENGTH     scm_readline_opts[1].val