summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2008-02-23 11:28:11 +0000
committerLudovic Courtès <ludo@gnu.org>2008-02-23 11:28:11 +0000
commita2c25234fbb110c9b888cdb89913ad3eb58df16c (patch)
tree70bd14ba555464e3bbcfd902a37f322734441304
parente27d2495372019f01c9e5fc75d72df62cb01d7ca (diff)
downloadguile-a2c25234fbb110c9b888cdb89913ad3eb58df16c.tar.gz
Use `imaginary_part' instead of `imaginary' to fix build on Solaris 2.10.
-rw-r--r--NEWS1
-rw-r--r--THANKS3
-rw-r--r--libguile/ChangeLog10
-rw-r--r--libguile/numbers.c8
4 files changed, 17 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 7f8342abc..8a9a245d9 100644
--- a/NEWS
+++ b/NEWS
@@ -48,6 +48,7 @@ would trigger an unbound variable error for `match:andmap'.
** Fixed build issue for GNU/Linux on IA64
** Fixed build issue on NetBSD 1.6
+** Fixed build issue on Solaris 2.10 x86_64
Changes in 1.8.4 (since 1.8.3)
diff --git a/THANKS b/THANKS
index 98020f00e..bc5d8dd13 100644
--- a/THANKS
+++ b/THANKS
@@ -28,6 +28,7 @@ For fixes or providing information which led to a fix:
Stephen Compall
Brian Crowder
Christopher Cramer
+ David Diffenbaugh
Hyper Division
Alexandre Duret-Lutz
Nils Durner
@@ -50,6 +51,7 @@ For fixes or providing information which led to a fix:
Steve Juranich
Richard Kim
Bruce Korb
+ René Köcher
Matthias Köppe
Matt Kraai
Miroslav Lichvar
@@ -59,6 +61,7 @@ For fixes or providing information which led to a fix:
Antoine Mathys
Dan McMahill
Roger Mc Murtrie
+ Tim Mooney
Han-Wen Nienhuys
Jan Nieuwenhuizen
Hrvoje Nikšić
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index b06fac9e3..91a548e02 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-23 Ludovic Courtès <ludo@gnu.org>
+
+ * numbers.c (scm_make_rectangular): Rename argument to
+ `real_part' and `imaginary_part' to work around Solaris 2.10
+ headers which define `imaginary' as a macro. Patch by Tim
+ Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
+
2008-02-22 Ludovic Courtès <ludo@gnu.org>
* read.c (strncasecmp): Add declaration when
@@ -12,7 +19,8 @@
Fix bug #22369.
* goops.c (scm_add_slot): Add `SCM_UNDEFINED' as last argument
- to `scm_list_n ()'. Thanks to the anonymous reporter.
+ to `scm_list_n ()'. Thanks to René Köcher
+ <shirk87@googlemail.com>.
2008-02-17 Ludovic Courtès <ludo@gnu.org>
diff --git a/libguile/numbers.c b/libguile/numbers.c
index 9c2a6511a..aad050481 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -5336,13 +5336,13 @@ scm_c_make_rectangular (double re, double im)
}
SCM_DEFINE (scm_make_rectangular, "make-rectangular", 2, 0, 0,
- (SCM real, SCM imaginary),
- "Return a complex number constructed of the given @var{real} and\n"
- "@var{imaginary} parts.")
+ (SCM real_part, SCM imaginary_part),
+ "Return a complex number constructed of the given @var{real-part} "
+ "and @var{imaginary-part} parts.")
#define FUNC_NAME s_scm_make_rectangular
{
struct dpair xy;
- scm_two_doubles (real, imaginary, FUNC_NAME, &xy);
+ scm_two_doubles (real_part, imaginary_part, FUNC_NAME, &xy);
return scm_c_make_rectangular (xy.x, xy.y);
}
#undef FUNC_NAME