AIX patches to 1.6.3

AIX patches to 1.6.3

[Albert Chin]

1. Trailing comma in enum illegal.
2. The AIX C compiler doesn't like variables defined as static
   somewhere then redefined as something else later one. Define it
   once to what it should be in the compilation unit.
3. Fix incorrect return value for prep_hashsets (forgot static
   keyword)

-- 
albert chin (china@thewrittenword.com)

-- snip snip
--- libguile/c-tokenize.lex.orig	2003-04-06 15:59:36.000000000 -0500
+++ libguile/c-tokenize.lex	2003-04-06 15:59:48.000000000 -0500
@@ -28,7 +28,7 @@
     SKIP,
     MULTILINE,
     MULTILINE_COOKIE,
-    COOKIE,
+    COOKIE
 };
 
 enum t_state state = SKIP;
--- libguile/eval.h.orig	2003-04-06 15:59:58.000000000 -0500
+++ libguile/eval.h	2003-04-06 16:00:11.000000000 -0500
@@ -178,7 +178,10 @@
 extern SCM scm_sym_else;
 extern SCM scm_sym_apply;
 extern SCM scm_sym_set_x;
+
+#ifndef STATIC_SCM_SYM_ARGS
 extern SCM scm_sym_args;
+#endif
 
 extern SCM scm_f_apply;
 
--- libguile/goops.c.orig	2003-04-06 16:00:22.000000000 -0500
+++ libguile/goops.c	2003-04-06 16:00:51.000000000 -0500
@@ -54,7 +54,10 @@
 #include "libguile/debug.h"
 #include "libguile/dynl.h"
 #include "libguile/dynwind.h"
+
+#define STATIC_SCM_SYM_ARGS
 #include "libguile/eval.h"
+
 #include "libguile/hashtab.h"
 #include "libguile/keywords.h"
 #include "libguile/macros.h"
@@ -597,7 +600,7 @@
 }
 #undef FUNC_NAME
 
-void
+static void
 prep_hashsets (SCM class)
 {
   unsigned int i;


_______________________________________________
Guile-devel mailing list
Guile-devel@gnu.org
http://mail.gnu.org/mailman/listinfo/guile-devel

Re: AIX patches to 1.6.3

[Rob Browning]

Albert Chin <guile-devel@lists.thewrittenword.com> writes:

> 1. Trailing comma in enum illegal.
> 2. The AIX C compiler doesn't like variables defined as static
>    somewhere then redefined as something else later one. Define it
>    once to what it should be in the compilation unit.

(Fixed with SCM_GLOBAL_SYMBOL instead).

> 3. Fix incorrect return value for prep_hashsets (forgot static
>    keyword)

Thanks.  Everything should be fixed in 1.6 and 1.7 CVS shortly.

-- 
Rob Browning
rlb @defaultvalue.org, @linuxdevel.com, and @debian.org
Previously @cs.utexas.edu
GPG starting 2002-11-03 = 14DD 432F AE39 534D B592  F9A0 25C8 D377 8C7E 73A4


_______________________________________________
Guile-devel mailing list
Guile-devel@gnu.org
http://mail.gnu.org/mailman/listinfo/guile-devel