summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2010-01-06 23:54:21 +0100
committerLudovic Courtès <ludo@gnu.org>2010-01-07 11:10:36 +0100
commite29dcaf3b7dde40b960455587142e7a79c53bfab (patch)
tree4580f079d96d49a965629cccd8d8c8f63a0179b8
parentdaa4a3f1ff34840f83705011780d62a5f4a56508 (diff)
downloadguile-e29dcaf3b7dde40b960455587142e7a79c53bfab.tar.gz
Fix 1.8-compatibility of `scm_search_path ()'.
* libguile/load.c (scm_search_path): Handle the 1.8-compatibility case where REST is `SCM_UNDEFINED'. Reported by Dale P. Smith.
-rw-r--r--libguile/load.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libguile/load.c b/libguile/load.c
index dbe80f62c..7c2dcfbe1 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -407,11 +407,12 @@ SCM_DEFINE (scm_search_path, "search-path", 2, 0, 1,
SCM extensions, require_exts;
SCM result = SCM_BOOL_F;
- if (scm_is_null (rest))
+ if (SCM_UNBNDP (rest) || scm_is_null (rest))
{
/* Called either by Scheme code that didn't provide the optional
arguments, or C code that used the Guile 1.8 signature (2 required,
- 1 optional arg) and passed '() as the EXTENSIONS argument. */
+ 1 optional arg) and passed '() or nothing as the EXTENSIONS
+ argument. */
extensions = SCM_EOL;
require_exts = SCM_UNDEFINED;
}