summaryrefslogtreecommitdiff
path: root/libguile/validate.h
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2012-11-05 15:57:03 -0500
committerMark H Weaver <mhw@netris.org>2012-11-05 15:57:03 -0500
commitfd57bbf5ac7c790f0731b1a44c7d20f469403009 (patch)
tree1af4a0bdf2c4183c9370688cca9cfdbedad56e10 /libguile/validate.h
parentd628c078cc8e2ccddbcab74346733486f7cf27e8 (diff)
parent02a362a665ce462e4fe2409b2e2fc2c0007360f2 (diff)
downloadguile-fd57bbf5ac7c790f0731b1a44c7d20f469403009.tar.gz
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: libguile/validate.h
Diffstat (limited to 'libguile/validate.h')
-rw-r--r--libguile/validate.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/libguile/validate.h b/libguile/validate.h
index 6dea795e5..b4d544151 100644
--- a/libguile/validate.h
+++ b/libguile/validate.h
@@ -3,7 +3,8 @@
#ifndef SCM_VALIDATE_H
#define SCM_VALIDATE_H
-/* Copyright (C) 1999,2000,2001, 2002, 2004, 2006, 2007, 2009, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2001, 2002, 2004, 2006, 2007, 2009,
+ * 2011, 2012 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
@@ -91,11 +92,9 @@
#define SCM_NUM2ULONG_LONG_DEF(pos, arg, def) \
(SCM_UNBNDP (arg) ? def : scm_to_ulong_long (arg))
-#define SCM_NUM2FLOAT(pos, arg) \
- (scm_num2float (arg, pos, FUNC_NAME))
+#define SCM_NUM2FLOAT(pos, arg) ((float) scm_to_double (arg))
-#define SCM_NUM2DOUBLE(pos, arg) \
- (scm_num2double (arg, pos, FUNC_NAME))
+#define SCM_NUM2DOUBLE(pos, arg) (scm_to_double (arg))
#define SCM_OUT_OF_RANGE(pos, arg) \
do { scm_out_of_range_pos (FUNC_NAME, arg, scm_from_int (pos)); } while (0)