The attached bundle or whatever it is that `bzr send' produces makes
guile-gnome from bzr load without deprecation warnings.
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: file:///home/wingo/src/g-wrap/mainline/
# testament_sha1: 97631dcee452edb9a8e4753ff46feee85e3f20f3
# timestamp: 2008-04-24 13:09:41 +0200
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog 2008-03-25 15:26:00 +0000
+++ ChangeLog 2008-04-24 11:05:43 +0000
@@ -1,3 +1,11 @@
+2008-04-24 Andy Wingo <[EMAIL PROTECTED]>
+
+ * guile/g-wrap/guile-runtime.c
+ (gw_guile_ensure_latent_variables_hash_and_binder)
+ (gw_guile_procedure_to_method_public, dynproc_smob_print)
+ (gw_guile_register_wrapset): Avoid INUMs so as to avoid
+ deprecation warnings on Guile 1.8.
+
2008-03-25 Andreas Rottmann <[EMAIL PROTECTED]>
* Makefile.am (SUBDIRS, DIST_SUBDIRS): Drop in-tree libffi.
=== modified file 'guile/g-wrap/guile-runtime.c'
--- guile/g-wrap/guile-runtime.c 2007-07-03 19:28:42 +0000
+++ guile/g-wrap/guile-runtime.c 2008-04-24 11:05:43 +0000
@@ -456,7 +456,7 @@
return SCM_BOOL_F; /* won't get here */
}
- scm_struct_set_x (module, SCM_MAKINUM (scm_module_index_binder),
+ scm_struct_set_x (module, scm_from_int (scm_module_index_binder),
scm_c_make_gsubr ("%gw-module-binder", 3, 0,
0, gw_module_binder_proc));
@@ -531,11 +531,12 @@
SCM pair;
SCM existing_latents;
SCM entry;
+ int cn_req_args;
SCM_VALIDATE_PROC (1, proc);
SCM_VALIDATE_LIST (2, specializers);
SCM_VALIDATE_SYMBOL (3, generic_name);
- SCM_VALIDATE_INUM (4, n_req_args);
+ SCM_VALIDATE_INT_COPY (4, n_req_args, cn_req_args);
/* the fifth is a bool */
generics = gw_guile_ensure_generics_module ();
@@ -553,7 +554,7 @@
proc,
specializers,
scm_current_module (),
- scm_to_int (n_req_args),
+ cn_req_args,
scm_is_true (use_optional_args));
return;
}
@@ -712,7 +713,7 @@
scm_display (scm_from_locale_string ("#<gw:dynproc "), port);
scm_display (scm_from_locale_string (fi->proc_name), port);
scm_display (scm_from_locale_string (" ("), port);
- scm_display (SCM_I_MAKINUM (fi->n_req_args), port);
+ scm_display (scm_from_int (fi->n_req_args), port);
scm_display (scm_from_locale_string (")>"), port);
return 1;
@@ -838,7 +839,7 @@
gw_guile_procedure_to_method_public (
subr, specializers,
scm_from_locale_symbol (fi->generic_name),
- SCM_I_MAKINUM (fi->n_req_args),
+ scm_from_int (fi->n_req_args),
(fi->n_optional_args ? SCM_BOOL_T : SCM_BOOL_F));
}
}
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa9l4O4AAnb/gEAwAARRd///
fqfPoL////BQBdheAAbYAAAGGkSPUyA0HqaepiAANAAANG1ADmAIwTEAwCYJoyGhgEwRiYShBJkT
T9UejRNlAAAA0A0aNNNAOYAjBMQDAJgmjIaGATBGJhJIEaAEAAp5qaEU8ajUae1Iaep6h6DR7hDt
JwYxmxZKsg+UBWGbLhv1GKthLLlCORUtrXXK0+ABQ6exrg6dokIRpRB6XSIyOd2Zy7+frq0w21FV
EVc3sgQfa9BsEsV7VmiPi15Yq4VMC343HFq8m8aZYOpSoK6YsUnvVNulFD5lgug0M9TKpF0Bwils
qS5ZcSp1uGFChGQd6AiO04wCJakkL4IwFQOikemGAY0Tu9m0F750lCHCIFuo+pS7t1NJyBtRrJAb
/+2p63mBc/ceASTGAbE8+x+COnaBSZVeMwyYTMELR2MGSUl/4aRrxCcvwHgVgSHDpV1JhLsUxN6b
QXkDYt0C4pPsZAqnA4YqAdE3xAqXcjXGM7PygXjj2XKm0xdXWPxWoCGi6Z8bhxnOqb4JyKTIxAxo
vaez4/FwKJiXDTKCIUgWFDdjRYMbMtBrnNDy0Ymaa6m89BjUCqituYFlBEwYfKpy2udaaCRCDbTa
Ebxxqo++NdDXFsNf9biaroAjWa4EgOOAFqnamKjT6ULerCkcOcOJaqaRxpU8pS1FiLgGLnjdDbJi
kycTJkTQdvJOfZW2q0cTirR8jRbQbAvOJ2Nlx3yLTsBeBGE3tdjAwL9txsMoyVprLMGrKFkFpIiT
eNcPqPYMCcacTUPGKBiuRcWSpNkF4qBZaaZuKiLzQQsVBgmLLTgZDHmVV5JxHjWyuCFigiPDdUOW
a9GS7sbb+TYUDu7ZQcq4hyHLs4045OmYmZtoe8JAmfykQU1J1VFVfPNwR9Y8TI7IOOknqsNEeJCI
iZYJcAEtte0ewT4QH54MX4E8OCgdWimS4jvQeTJOGFRXT0YPgToHmY2Z/boxme4rXvPkOVC+J6Hz
ifmTPfqoPQxvv1GSKta0Uw6mWoHh/e9KIvucTlmTJ/MGPU5ER3q/1Og7kw84mBxPUzKR8jM0Kg+5
Qcu6yPxSG5Fth1PU7jH5lpBXWngagYkGEDyM7qm8BcPs2Q04hXW2wnpf5DyI5xYEQaRQJxcbt5v+
hFTbieC14VLAksToHkzATHLqmBxzxA4juPbSczoRPaXWL6GG1YPwQyPMcDFrG4yvGOUMhjADEDYP
sPNOFzGEwaILrwDaYmpQTFKCmhD9V5mMZmw5nA1Eig3qk7+60pKlvMl+h9DudSxlvWwCzt/o0lDI
yP2B6A3C/YkabCwXosBbawOI5hesj3Y8zz1CNw/FaxtGsKhbwJHBe0mMhhhhgeien6o5Kdv8L5Ar
iCovNnOmGu0YDxQY+87+MTKzgUq5HXdyApCBPMNrJDMGw1AMbc45mHPmYgyY1hoVims978Btc8jh
GmxUbQe6hL2stIMH1MDizKihDDB/hSyT4MgJ5HYCAfkbEHAoEycmTmEyzwWkrHexkhxrORaHoM8/
32DUQTai0NLJfDKSLEYK0cskFMQ6j1pLb7Tnz4hBVB12ZlN9m46HQYttGvHkReSkgg9HgyuRl4hW
FhUqUmFZ43FzJ8QK5UHpYojw2bVJ4fIJUjMSzVMF1PmPHI4VgOppGTbS/Hyc378sDG0enLqgYqBi
kfWmIog29FDKJ06QD4LA9w8o8PUHE9GxBCRhAwCdBRaTUSkpDanmBUiQMxQwYzB5kebrf4MUiBt8
EEl6oIqxSLS1ZIM1oPeVe2oWg+H6+Ddz5AxuL1zDciEWbBvu5CVKSsVVYsogyR6f8XckU4UJCvZe
DuA=
Thanks,
Andy
--
http://wingolog.org/
_______________________________________________
g-wrap-dev mailing list
g-wrap-dev@nongnu.org
http://lists.nongnu.org/mailman/listinfo/g-wrap-dev
