* added files {arch}/g-wrap/g-wrap--rotty/g-wrap--rotty--0.1/address@hidden/patch-log/patch-5 {arch}/g-wrap/g-wrap--rotty/g-wrap--rotty--0.1/address@hidden/patch-log/patch-6 {arch}/g-wrap/g-wrap--rotty/g-wrap--rotty--0.2/address@hidden/patch-log/patch-2 * modified files --- orig/ChangeLog +++ mod/ChangeLog @@ -1,5 +1,10 @@ 2003-11-11 Andreas Rottmann + * test/gw-test-glib-spec.scm: Use #:use-module clauses instead of + (use-modules ...) statements. + + * g-wrap/g-wrap-glib.c: Fixes for Guile 1.7. + * bin/g-wrap-config.in (c-link-args): s/gwrap-wct/gwrap-runtime/ and don't link against libgwrap-glib. --- orig/g-wrap/g-wrap-glib.c +++ mod/g-wrap/g-wrap-glib.c @@ -35,7 +35,7 @@ result = scm_sum(scm_ash(gh_ulong2scm(upper_half), SCM_MAKINUM(32)), gh_ulong2scm(lower_half)); - if(negative_p) { + if (negative_p) { return scm_difference(SCM_INUM0, result); } else { return result; @@ -63,7 +63,7 @@ if (bits00to15_mask == SCM_BOOL_F) { bits00to15_mask = gh_ulong2scm(0xFFFF); - scm_protect_object (bits00to15_mask); + scm_gc_protect_object (bits00to15_mask); } /* @@ -115,8 +115,8 @@ tmp <<= 32; minval = gw_glib_gint64_to_scm(tmp); - scm_protect_object(maxval); - scm_protect_object(minval); + scm_gc_protect_object(maxval); + scm_gc_protect_object(minval); initialized = 1; } --- orig/test/gw-test-glib-spec.scm +++ mod/test/gw-test-glib-spec.scm @@ -1,10 +1,9 @@ (define-module (gw-test-glib-spec) - :use-module (g-wrap)) - -(use-modules (g-wrap gw-standard-spec)) -(use-modules (g-wrap gw-wct-spec)) -(use-modules (g-wrap gw-glib-spec)) + #:use-module (g-wrap) + #:use-module (g-wrap gw-standard-spec) + #:use-module (g-wrap gw-wct-spec) + #:use-module (g-wrap gw-glib-spec)) (let ((ws (gw:new-wrapset "gw-test-glib")))