The FSF has a new address.

[bpt/guile.git] / libguile / gh_predicates.c

diff --git a/libguile/gh_predicates.c b/libguile/gh_predicates.c
index cd42905..b0d0c1b 100644 (file)
--- a/libguile/gh_predicates.c
+++ b/libguile/gh_predicates.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 \f
 
@@ -24,74 +24,74 @@
 int 
 gh_boolean_p (SCM val)
 {
-  return (SCM_NFALSEP (scm_boolean_p (val)));
+  return (scm_is_true (scm_boolean_p (val)));
 }
 int 
 gh_symbol_p (SCM val)
 {
-  return (SCM_NFALSEP (scm_symbol_p (val)));
+  return (scm_is_true (scm_symbol_p (val)));
 }
 int 
 gh_char_p (SCM val)
 {
-  return (SCM_NFALSEP (scm_char_p (val)));
+  return (scm_is_true (scm_char_p (val)));
 }
 int 
 gh_vector_p (SCM val)
 {
-  return (SCM_NFALSEP (scm_vector_p (val)));
+  return (scm_is_true (scm_vector_p (val)));
 }
 int 
 gh_pair_p (SCM val)
 {
-  return (SCM_NFALSEP (scm_pair_p (val)));
+  return (scm_is_true (scm_pair_p (val)));
 }
 int 
 gh_number_p (SCM val)
 {
-  return (SCM_NFALSEP (scm_number_p (val)));
+  return (scm_is_true (scm_number_p (val)));
 }
 int 
 gh_string_p (SCM val)
 {
-  return (SCM_NFALSEP (scm_string_p (val)));
+  return (scm_is_true (scm_string_p (val)));
 }
 int 
 gh_procedure_p (SCM val)
 {
-  return (SCM_NFALSEP (scm_procedure_p (val)));
+  return (scm_is_true (scm_procedure_p (val)));
 }
 int 
 gh_list_p (SCM val)
 {
-  return (SCM_NFALSEP (scm_list_p (val)));
+  return (scm_is_true (scm_list_p (val)));
 }
 int 
 gh_inexact_p (SCM val)
 {
-  return (SCM_NFALSEP (scm_inexact_p (val)));
+  return (scm_is_true (scm_inexact_p (val)));
 }
 int 
 gh_exact_p (SCM val)
 {
-  return (SCM_NFALSEP (scm_exact_p (val)));
+  return (scm_is_true (scm_exact_p (val)));
 }
 
 /* the three types of equality */
 int 
 gh_eq_p (SCM x, SCM y)
 {
-  return (SCM_NFALSEP (scm_eq_p (x, y)));
+  return (scm_is_true (scm_eq_p (x, y)));
 }
 int 
 gh_eqv_p (SCM x, SCM y)
 {
-  return (SCM_NFALSEP (scm_eqv_p (x, y)));
+  return (scm_is_true (scm_eqv_p (x, y)));
 }
 int 
 gh_equal_p (SCM x, SCM y)
 {
-  return (SCM_NFALSEP (scm_equal_p (x, y)));
+  return (scm_is_true (scm_equal_p (x, y)));
 }
 
 /* equivalent to (string=? ...), but returns 0 or 1 rather than Scheme
@@ -99,7 +99,7 @@ gh_equal_p (SCM x, SCM y)
 int
 gh_string_equal_p(SCM s1, SCM s2)
 {
-  return (SCM_NFALSEP (scm_string_equal_p(s1, s2)));
+  return (scm_is_true (scm_string_equal_p(s1, s2)));
 }
 
 /* equivalent to (null? ...), but returns 0 or 1 rather than Scheme
@@ -107,7 +107,7 @@ gh_string_equal_p(SCM s1, SCM s2)
 int
 gh_null_p(SCM l)
 {
-  return (SCM_NFALSEP(scm_null_p(l)));
+  return (scm_is_true(scm_null_p(l)));
 }
 
 /*