Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 370510 Details for
Bug 491716
dev-lang/swig generates code incompatible with ~dev-scheme/guile-1.8.8[-discouraged] (causing build failure of media-gfx/graphviz[guile])
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
swig-2.0.12-guile-no_discouraged_code.patch
swig-2.0.12-guile-no_discouraged_code.patch (text/plain), 3.24 KB, created by
Arfrever Frehtes Taifersar Arahesis
on 2014-02-15 19:29:02 UTC
(
hide
)
Description:
swig-2.0.12-guile-no_discouraged_code.patch
Filename:
MIME Type:
Creator:
Arfrever Frehtes Taifersar Arahesis
Created:
2014-02-15 19:29:02 UTC
Size:
3.24 KB
patch
obsolete
>--- Examples/test-suite/guile/guile_ext_test_external.cxx >+++ Examples/test-suite/guile/guile_ext_test_external.cxx >@@ -19,6 +19,6 @@ > SCM test_is_pointer(SCM val) > { > #define FUNC_NAME "test-is-pointer" >- return SCM_BOOL(SWIG_IsPointer(val)); >+ return scm_from_bool(SWIG_IsPointer(val)); > #undef FUNC_NAME > } >--- Lib/guile/guile_scm_run.swg >+++ Lib/guile/guile_scm_run.swg >@@ -125,7 +125,7 @@ > else > SCM_NEWSMOB2(smob, swig_tag, ptr, (void *) type); > >- if (!cdata || SCM_NULLP(cdata->goops_class) || swig_make_func == SCM_EOL ) { >+ if (!cdata || scm_is_null(cdata->goops_class) || swig_make_func == SCM_EOL ) { > return smob; > } else { > /* the scm_make() C function only handles the creation of gf, >@@ -145,7 +145,7 @@ > SWIG_Guile_PointerAddress(SCM object) > { > SCM smob = SWIG_Guile_GetSmob(object); >- if (SCM_NULLP(smob)) return 0; >+ if (scm_is_null(smob)) return 0; > else if (SCM_SMOB_PREDICATE(swig_tag, smob) > || SCM_SMOB_PREDICATE(swig_collectable_tag, smob) > || SCM_SMOB_PREDICATE(swig_destroyed_tag, smob)) { >@@ -158,7 +158,7 @@ > SWIG_Guile_PointerType(SCM object) > { > SCM smob = SWIG_Guile_GetSmob(object); >- if (SCM_NULLP(smob)) return NULL; >+ if (scm_is_null(smob)) return NULL; > else if (SCM_SMOB_PREDICATE(swig_tag, smob) > || SCM_SMOB_PREDICATE(swig_collectable_tag, smob) > || SCM_SMOB_PREDICATE(swig_destroyed_tag, smob)) { >@@ -174,7 +174,7 @@ > swig_type_info *from; > SCM smob = SWIG_Guile_GetSmob(s); > >- if (SCM_NULLP(smob)) { >+ if (scm_is_null(smob)) { > *result = NULL; > return SWIG_OK; > } else if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) { >@@ -236,7 +236,7 @@ > SWIG_Guile_MarkPointerNoncollectable(SCM s) > { > SCM smob = SWIG_Guile_GetSmob(s); >- if (!SCM_NULLP(smob)) { >+ if (!scm_is_null(smob)) { > if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) { > SCM_SET_CELL_TYPE(smob, swig_tag); > } >@@ -249,7 +249,7 @@ > SWIG_Guile_MarkPointerDestroyed(SCM s) > { > SCM smob = SWIG_Guile_GetSmob(s); >- if (!SCM_NULLP(smob)) { >+ if (!scm_is_null(smob)) { > if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) { > SCM_SET_CELL_TYPE(smob, swig_destroyed_tag); > } >@@ -477,20 +477,20 @@ > int i; > int num_args_passed = 0; > for (i = 0; i<reqargs; i++) { >- if (!SCM_CONSP(rest)) >+ if (!scm_is_pair(rest)) > scm_wrong_num_args(scm_from_utf8_string(procname ? (char *) procname : "unknown procedure")); > *dest++ = SCM_CAR(rest); > rest = SCM_CDR(rest); > num_args_passed++; > } >- for (i = 0; i<optargs && SCM_CONSP(rest); i++) { >+ for (i = 0; i<optargs && scm_is_pair(rest); i++) { > *dest++ = SCM_CAR(rest); > rest = SCM_CDR(rest); > num_args_passed++; > } > for (; i<optargs; i++) > *dest++ = SCM_UNDEFINED; >- if (!SCM_NULLP(rest)) >+ if (!scm_is_null(rest)) > scm_wrong_num_args(scm_from_utf8_string(procname ? (char *) procname : "unknown procedure")); > return num_args_passed; > } >--- Lib/guile/typemaps.i >+++ Lib/guile/typemaps.i >@@ -412,7 +412,7 @@ > %typecheck(SWIG_TYPECHECK_BOOL) > bool, bool&, const bool& > { >- $1 = SCM_BOOLP($input) ? 1 : 0; >+ $1 = scm_is_bool($input) ? 1 : 0; > } > > %typecheck(SWIG_TYPECHECK_DOUBLE)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 491716
:
363602
|
370510
|
439442
|
519300
|
589354