<short summary of the patch>

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

gcl (2.6.12-67) unstable; urgency=medium

  * Version_2_6_13pre55

Gbp-Pq: Name Version_2_6_13pre55

diff --git a/h/notcomp.h b/h/notcomp.h
index 6993cd4261d81a7ac9a6a9c3b732f9fd1b2eded4..3d3309098994ecb88674b6bdb1bd66a1f2dbbdb0 100755 (executable)
--- a/h/notcomp.h
+++ b/h/notcomp.h
@@ -374,3 +374,5 @@ EXTER gmp_randfnptr_t Mersenne_Twister_Generator_Noseed;
 #endif
 
 #define collect(p_,f_) (p_)=&(*(p_)=(f_))->c.c_cdr
+#define READ_STREAM_OR_FASD(strm_) \
+  type_of(strm_)==t_stream ? read_object_non_recursive(strm_) : fSread_fasd_top(strm_)

diff --git a/o/cmpaux.c b/o/cmpaux.c
index e6b88086606d3b49578fa2e338f1b2683c63218a..5599171fdb03718a3622b1fb45516a1aaf2915e1 100755 (executable)
--- a/o/cmpaux.c
+++ b/o/cmpaux.c
@@ -363,7 +363,7 @@ do_init(object *statVV) {
 
   if (ch!='\n') {
     struct fasd * fd;
-    faslfile=FFN(fSopen_fasd)(faslfile,sKinput,OBJNULL,Cnil);
+    faslfile=fSopen_fasd(faslfile,sKinput,OBJNULL,Cnil);
     fd=(struct fasd *)faslfile->v.v_self;
     n=fix(fd->table_length);
     fd->table->v.v_self=alloca(n*sizeof(object));
@@ -371,7 +371,7 @@ do_init(object *statVV) {
     fd->table->v.v_dim=faslfile->v.v_self[1]->v.v_fillp=n;
   }
 
-  n=fix(type_of(faslfile)==t_stream ? read_object(faslfile) : FFN(fSread_fasd_top)(faslfile));
+  n=fix(READ_STREAM_OR_FASD(faslfile));
   sSPinit->s.s_dbind=fasl_vec=fSmake_vector1_1(n,aet_object,Cnil);
 
   /* switch SPinit to point to a vector of function addresses */
@@ -395,9 +395,9 @@ do_init(object *statVV) {
   */
   /* Now we can run the forms f1 f2 in form= (%init f1 f2 ...) */
 
-  FFN(fSload_stream)(faslfile,Cnil);
+  fSload_stream(faslfile,Cnil);
   if (type_of(faslfile)!=t_stream)
-    FFN(fSclose_fasd)(faslfile);
+    fSclose_fasd(faslfile);
 
 }
 

diff --git a/o/fasdump.c b/o/fasdump.c
index d0e25653752246c1a79a00a2727cb6b8d6995b9c..e3c149dac9f1788193aa047340226fc8211ed6dd 100755 (executable)
--- a/o/fasdump.c
+++ b/o/fasdump.c
@@ -561,6 +561,13 @@ DEFUN_NEW("READ-FASD-TOP",object,fSread_fasd_top,SI,1,1,NONE,OO,OO,OO,OO,(object
      { RESTORE_FASD;
      return result;}
  }
+#ifdef STATIC_FUNCTION_POINTERS
+object
+fSread_fasd_top(object x) {
+  return FFN(fSread_fasd_top)(x);
+}
+#endif
+
 
 object sLeq;
 object sSPinit;
@@ -618,6 +625,12 @@ DEFUN_NEW("OPEN-FASD",object,fSopen_fasd,SI,4,4,NONE,OO,OO,OO,OO,(object stream,
     fd->table_length=current_fasd.table_length;
     return result;
   }}
+#ifdef STATIC_FUNCTION_POINTERS
+object
+fSopen_fasd(object stream, object direction, object eof, object tabl) {
+  return FFN(fSopen_fasd)(stream,direction,eof,tabl);
+}
+#endif
 
 DEFUN_NEW("CLOSE-FASD",object,fSclose_fasd,SI,1,1,NONE,OO,OO,OO,OO,(object ar),"")
 /* static object */
@@ -649,6 +662,12 @@ DEFUN_NEW("CLOSE-FASD",object,fSclose_fasd,SI,1,1,NONE,OO,OO,OO,OO,(object ar),"
    return ar;
   
  }
+#ifdef STATIC_FUNCTION_POINTERS
+object
+fSclose_fasd(object ar) {
+  return FFN(fSclose_fasd)(ar);
+}
+#endif
 
 
 #define HASHP(x) 1

diff --git a/o/file.d b/o/file.d
index 1e1fa6567b0ab3a6da9af6397d81479246515be1..49f016d64565b8e3a5a647c8d43d015bc7c0dcf0 100755 (executable)
--- a/o/file.d
+++ b/o/file.d
@@ -1645,8 +1645,7 @@ DEFUN_NEW("LOAD-STREAM",object,fSload_stream,SI,2,2,NONE,OO,OO,OO,OO,(object str
   for (;;) {
     preserving_whitespace_flag = FALSE;
     detect_eos_flag = TRUE;
-    x = type_of(strm)==t_stream ? read_object_non_recursive(strm) : FFN(fSread_fasd_top)(strm);
-    if (x == OBJNULL)
+    if ((x = READ_STREAM_OR_FASD(strm))==OBJNULL)
       break;
     {
       object *base = vs_base, *top = vs_top, *lex = lex_env;
@@ -1672,6 +1671,12 @@ DEFUN_NEW("LOAD-STREAM",object,fSload_stream,SI,2,2,NONE,OO,OO,OO,OO,(object str
   RETURN1(Ct);
 
 }
+#ifdef STATIC_FUNCTION_POINTERS
+object
+fSload_stream(object strm,object print) {
+  return FFN(fSload_stream)(strm,print);
+}
+#endif
 
 DEFUN_NEW("LOAD-FASL",object,fSload_fasl,SI,2,2,NONE,OO,OO,OO,OO,(object fasl_filename,object print),"") {