[Guile-commits] GNU Guile branch, master, updated. release_1-9-13-5-g534bbcc

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=534bbcc168e06f81a839dff743ba8180a763d53c

The branch, master has been updated
       via  534bbcc168e06f81a839dff743ba8180a763d53c (commit)
       via  c1a0ba1cef7cf16d9efc230d4a3166abdef3f29e (commit)
       via  ddffdd788d433318d528f7e4ec3da2a48c0f1fb9 (commit)
      from  73124c6c630e2cc1877adc118691b96c4aec2c5b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 534bbcc168e06f81a839dff743ba8180a763d53c
Author: Andy Wingo <address@hidden>
Date:   Mon Oct 18 13:35:46 2010 +0200

    more -Wundef on darwin fixes
    
    * libguile/threads.c:
    * libguile/posix.c: Change a couple #if HAVE_FOO to #ifdef HAVE_FOO to
      pacify -Wundef. Some vars are defined or not, whereas some are always
      defined to 0 or 1. The inconsistency is unfortunate.

commit c1a0ba1cef7cf16d9efc230d4a3166abdef3f29e
Author: Andy Wingo <address@hidden>
Date:   Mon Oct 18 13:29:58 2010 +0200

    uninitialized var in scm_read_character
    
    * libguile/read.c (scm_read_character): Fix error condition where
      charname could be uninitialized.

commit ddffdd788d433318d528f7e4ec3da2a48c0f1fb9
Author: Andy Wingo <address@hidden>
Date:   Mon Oct 18 13:27:17 2010 +0200

    _scm GUILE_USE_64_CALLS compilation warning fix
    
    * libguile/_scm.h: Check that GUILE_USE_64_CALLS is defined. Fixes an
      error on i386-apple-darwin9.8.0.

-----------------------------------------------------------------------

Summary of changes:
 libguile/_scm.h    |    2 +-
 libguile/posix.c   |    6 +++---
 libguile/read.c    |    3 +--
 libguile/threads.c |    2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/libguile/_scm.h b/libguile/_scm.h
index f9b140f..219b3a2 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -124,7 +124,7 @@
   ((align) ? (((len) - 1UL) | ((align) - 1UL)) + 1UL : (len))
 
 
-#if GUILE_USE_64_CALLS && defined(HAVE_STAT64)
+#if defined GUILE_USE_64_CALLS && GUILE_USE_64_CALLS && defined(HAVE_STAT64)
 #define CHOOSE_LARGEFILE(foo,foo64)     foo64
 #else
 #define CHOOSE_LARGEFILE(foo,foo64)     foo
diff --git a/libguile/posix.c b/libguile/posix.c
index a28cfa3..f371cb2 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -121,7 +121,7 @@ extern char *ttyname();
 # include <xlocale.h>
 #endif
 
-#if HAVE_CRYPT_H
+#ifdef HAVE_CRYPT_H
 #  include <crypt.h>
 #endif
 
@@ -1755,7 +1755,7 @@ SCM_DEFINE (scm_sync, "sync", 0, 0, 0,
    multiple cpus.  So for now we don't bother with anything fancy, just
    ensure it works.  */
 
-#if HAVE_CRYPT
+#ifdef HAVE_CRYPT
 SCM_DEFINE (scm_crypt, "crypt", 2, 0, 0,
             (SCM key, SCM salt),
            "Encrypt @var{key} using @var{salt} as the salt value to the\n"
@@ -1841,7 +1841,7 @@ SCM_DEFINE (scm_getlogin, "getlogin", 0, 0, 0,
 #undef FUNC_NAME
 #endif /* HAVE_GETLOGIN */
 
-#if HAVE_CUSERID
+#ifdef HAVE_CUSERID
 
 # if !HAVE_DECL_CUSERID
 extern char *cuserid (char *);
diff --git a/libguile/read.c b/libguile/read.c
index 118b9cc..c9219bc 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -906,7 +906,7 @@ scm_read_character (scm_t_wchar chr, SCM port)
 
   overflow = read_token (port, buffer, READER_CHAR_NAME_MAX_SIZE, &bytes_read);
   if (overflow)
-    goto char_error;
+    scm_i_input_error (FUNC_NAME, port, "character name too long", SCM_EOL);
 
   if (bytes_read == 0)
     {
@@ -992,7 +992,6 @@ scm_read_character (scm_t_wchar chr, SCM port)
         return ch;
     }
 
- char_error:
   scm_i_input_error (FUNC_NAME, port, "unknown character name ~a",
                     scm_list_1 (charname));
 
diff --git a/libguile/threads.c b/libguile/threads.c
index 8249ebf..6bc53a8 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -630,7 +630,7 @@ scm_i_init_thread_for_guile (SCM_STACKITEM *base, SCM 
parent)
 
 #if SCM_USE_PTHREAD_THREADS
 
-#if HAVE_PTHREAD_ATTR_GETSTACK && HAVE_PTHREAD_GETATTR_NP
+#if defined HAVE_PTHREAD_ATTR_GETSTACK && defined HAVE_PTHREAD_GETATTR_NP
 /* This method for GNU/Linux and perhaps some other systems.
    It's not for MacOS X or Solaris 10, since pthread_getattr_np is not
    available on them.  */


hooks/post-receive
-- 
GNU Guile