summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Zambito <contact@robbyzambito.me>2023-02-16 09:13:14 -0500
committerRobby Zambito <contact@robbyzambito.me>2023-02-16 09:13:14 -0500
commit61660091e2d05281791b24e775c5fdde93fd93df (patch)
treee64117fd4d22132a93351beb231b1fdabbda8d25
parentc6fb4484e22ff2cb35cdfd9c7d6faa9ef775eb35 (diff)
parent73a0cba3f4d4fa825a21332fbcc159e68cd3a1ea (diff)
Merge branch 'master' into json-records
-rw-r--r--lib/zambyte/meta/guile-json.scm (renamed from lib/zambyte/meta/guile.scm)0
-rw-r--r--lib/zambyte/meta/json.sld3
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/zambyte/meta/guile.scm b/lib/zambyte/meta/guile-json.scm
index 1e41f9c..1e41f9c 100644
--- a/lib/zambyte/meta/guile.scm
+++ b/lib/zambyte/meta/guile-json.scm
diff --git a/lib/zambyte/meta/json.sld b/lib/zambyte/meta/json.sld
index 500b7a0..5542884 100644
--- a/lib/zambyte/meta/json.sld
+++ b/lib/zambyte/meta/json.sld
@@ -114,7 +114,8 @@
((and (library (macduffie json)) (srfi 69))
(include-library-declarations "macduffie.scm"))
((and guile (library (json)))
- (include-library-declarations "guile.scm"))
+ (import (only (guile) include-from-path import))
+ (begin (include-from-path "zambyte/meta/guile-json.scm")))
(gauche
(include-library-declarations "gauche.scm"))
(gerbil