<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.14-6) unstable; urgency=medium

  * Version_2_6_15pre5

Gbp-Pq: Name Version_2_6_15pre5

diff --git a/git.tag b/git.tag
index 1bc64dcf8e763396c220242b826cd27aacaa233f..25cd39080e3f2ba6ef2a89d6de0cd338218c261c 100644 (file)
--- a/git.tag
+++ b/git.tag
@@ -1 +1 @@
-"Version_2_6_15pre4"
+"Version_2_6_15pre5"

diff --git a/o/character.d b/o/character.d
index 27156d406cc402c364f5c148d7657d0ec7a5a42a..c9825e9f5a304024918a017cc663365f226a86a1 100755 (executable)
--- a/o/character.d
+++ b/o/character.d
@@ -503,7 +503,6 @@ gcl_init_character()
 
        for (i = 0;  i < CHCODELIM;  i++) {
          object x=(object)(character_table+i);
-         x->fw=0;
          set_type_of(x,t_character);
          /* character_table[i].ch.t = (short)t_character; */
          character_table[i].ch.ch_code = i;

diff --git a/o/makefile b/o/makefile
index db1e2923302379e1850599b873a42a60790a04ad..22ec15fa8f1883e4b3fb57abc6c3a548fc0d5b67 100644 (file)
--- a/o/makefile
+++ b/o/makefile
@@ -78,7 +78,7 @@ new_init.c: ${INI_FILES}
        echo 'void NewInit(void){' >> $@
        cat ${INI_FILES} >> $@
        echo '}' >> $@
-       ! cat $@ | awk -F, '/DEFUN/ {print $2}' | grep -v object || (rm $@ && false)
+       ! cat $@ | awk -F, '/DEFUN/ {print $$1,$$2}' | grep -v object || (rm $@ && false)
 
 ifneq ($(NIFLAGS),)
 new_init.o: new_init.c $(DECL)

diff --git a/o/package.d b/o/package.d
index 0b5bbc97d80bdcfcea7db655aeeaea917ecdf485..b5be99b87f308ef58482a38474e79cadfd52c617 100755 (executable)
--- a/o/package.d
+++ b/o/package.d
@@ -392,8 +392,8 @@ object x;
   return(h);
 }}
 
-DEFUN_NEW("PACK-HASH",fixnum,fSpack_hash,SI,1,1,NONE,IO,OO,OO,OO,(object x),"") {
-  RETURN1(pack_hash(x));
+DEFUN_NEW("PACK-HASH",object,fSpack_hash,SI,1,1,NONE,IO,OO,OO,OO,(object x),"") {
+  RETURN1((object)(fixnum)pack_hash(x));
 }
 
 DEFUN_NEW("SET-SYMBOL-HPACK",object,fSset_symbol_hpack,SI,2,2,NONE,OO,OO,OO,OO,(object p,object s),"") {
@@ -407,9 +407,9 @@ DEFUN_NEW("SET-SYMBOL-HPACK",object,fSset_symbol_hpack,SI,2,2,NONE,OO,OO,OO,OO,(
 /*   RETURN1(x->p.p_internal[i]); */
 /* } */
 
-DEFUN_NEW("PACKAGE-INTERNAL_SIZE",fixnum,fSpackage_internal_size,SI,1,1,NONE,IO,OO,OO,OO,(object x),"") {
+DEFUN_NEW("PACKAGE-INTERNAL_SIZE",object,fSpackage_internal_size,SI,1,1,NONE,IO,OO,OO,OO,(object x),"") {
   check_type_package(&x);
-  RETURN1(x->p.p_internal_size);
+  RETURN1((object)(fixnum)x->p.p_internal_size);
 }
 
 /* DEFUN_NEW("PACKAGE-EXTERNAL",object,fSpackage_external,SI,2,2,NONE,OO,IO,OO,OO,(object x,fixnum i),"") { */
@@ -417,9 +417,9 @@ DEFUN_NEW("PACKAGE-INTERNAL_SIZE",fixnum,fSpackage_internal_size,SI,1,1,NONE,IO,
 /*   RETURN1(x->p.p_external[i]); */
 /* } */
 
-DEFUN_NEW("PACKAGE-EXTERNAL_SIZE",fixnum,fSpackage_external_size,SI,1,1,NONE,IO,OO,OO,OO,(object x),"") {
+DEFUN_NEW("PACKAGE-EXTERNAL_SIZE",object,fSpackage_external_size,SI,1,1,NONE,IO,OO,OO,OO,(object x),"") {
   check_type_package(&x);
-  RETURN1(x->p.p_external_size);
+  RETURN1((object)(fixnum)x->p.p_external_size);
 }
 
 /*