summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2008-02-07 09:54:47 +0000
committerLudovic Courtès <ludo@gnu.org>2008-02-07 09:54:47 +0000
commit7f74cf9a67398b58412cd40ff589a5a7cf22e74b (patch)
tree2ebb5dd3172801ce8a440de470e4a8a33800ffde
parent86a597f8b38ecc9de563977aa150ddff3771cadc (diff)
downloadguile-7f74cf9a67398b58412cd40ff589a5a7cf22e74b.tar.gz
More compilation fixes with Sun CC (bug #21378).
-rw-r--r--NEWS2
-rw-r--r--libguile/ChangeLog11
-rw-r--r--libguile/read.c6
-rw-r--r--libguile/strings.c4
4 files changed, 17 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index e6f640598..d083ee338 100644
--- a/NEWS
+++ b/NEWS
@@ -51,7 +51,7 @@ called with an associator proc that returns neither a pair nor #f.
** Secondary threads now always return a valid module for (current-module).
** Avoid MacOS build problems caused by incorrect combination of "64"
system and library calls.
-** Fixed compilation of `numbers.c' with Sun Studio (Solaris 9)
+** Fixed build with Sun Studio (Solaris 9)
** Fixed wrong-type-arg errors when creating zero length SRFI-4
uniform vectors on AIX.
** Fixed a deadlock that occurs upon GC with multiple threads.
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index ce60ca4dc..d36a4e3ea 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,14 @@
+2008-02-07 Ludovic Courtès <ludo@gnu.org>
+
+ Fix bug #21378.
+ Thanks to David Diffenbaugh <davediff@nbcs.rutgers.edu>.
+
+ * read.c (scm_read_quote): Don't use `__FUNCTION__' since it is
+ not supported by Sun CC on Solaris 9.
+ (scm_read_keyword): Likewise.
+ * strings.c (scm_take_locale_stringn): Remove
+ `SCM_C_INLINE_KEYWORD' to allow compilation with Sun CC.
+
2008-02-07 Julian Graham <joolean@gmail.com>
* threads.c (do_thread_exit, scm_cancel_thread,
diff --git a/libguile/read.c b/libguile/read.c
index 53715f2b5..40f6aa824 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1999,2000,2001,2003, 2004, 2006, 2007 Free Software
+/* Copyright (C) 1995,1996,1997,1999,2000,2001,2003, 2004, 2006, 2007, 2008 Free Software
* Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
@@ -657,7 +657,7 @@ scm_read_quote (int chr, SCM port)
default:
fprintf (stderr, "%s: unhandled quote character (%i)\n",
- __FUNCTION__, chr);
+ "scm_read_quote", chr);
abort ();
}
@@ -772,7 +772,7 @@ scm_read_keyword (int chr, SCM port)
XXX: This implementation allows sloppy syntaxes like `#: key'. */
symbol = scm_read_expression (port);
if (!scm_is_symbol (symbol))
- scm_i_input_error (__FUNCTION__, port,
+ scm_i_input_error ("scm_read_keyword", port,
"keyword prefix `~a' not followed by a symbol: ~s",
scm_list_2 (SCM_MAKE_CHAR (chr), symbol));
diff --git a/libguile/strings.c b/libguile/strings.c
index 947bcb498..c322132fd 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1998,2000,2001, 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,2000,2001, 2004, 2006, 2008 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
@@ -124,7 +124,7 @@ make_stringbuf (size_t len)
/* Return a new stringbuf whose underlying storage consists of the LEN+1
octets pointed to by STR (the last octet is zero). */
-SCM_C_INLINE_KEYWORD SCM
+SCM
scm_i_take_stringbufn (char *str, size_t len)
{
scm_gc_register_collectable_memory (str, len + 1, "stringbuf");