[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-39-gfe51c7b

[Ludovic Courtès]

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=fe51c7b3e0a1e93be3bb81dd2d4b18936fe2df3a

The branch, stable-2.0 has been updated
       via  fe51c7b3e0a1e93be3bb81dd2d4b18936fe2df3a (commit)
       via  e472f65245b6b5744be8b8acf2ec3d27902bd941 (commit)
      from  23cf330c86a56b12525af0fea8ce7da0e0981e45 (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 fe51c7b3e0a1e93be3bb81dd2d4b18936fe2df3a
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jul 17 17:57:43 2013 +0200

    Fix 'SCM_SYSCALL' to really swallow EINTR.
    
    * libguile/_scm.h (SCM_SYSCALL): Keep looping upon EINTR.
      Reported at
      <http://lists.gnu.org/archive/html/guile-devel/2013-06/msg00050.html>.

commit e472f65245b6b5744be8b8acf2ec3d27902bd941
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jul 17 15:11:51 2013 +0200

    build: Add `gdbinit' to the distribution.
    
    * Makefile.am (EXTRA_DIST): Add gdbinit.

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

Summary of changes:
 Makefile.am     |    3 ++-
 libguile/_scm.h |   50 +++++++++++++++++++++++++-------------------------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8cdcc7e..2ed8370 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,8 @@ EXTRA_DIST = LICENSE HACKING GUILE-VERSION                    
\
             gnulib-local/lib/localcharset.c.diff               \
             gnulib-local/m4/clock_time.m4.diff                 \
             gnulib-local/build-aux/git-version-gen.diff        \
-            libguile/texi-fragments-to-docstrings
+            libguile/texi-fragments-to-docstrings              \
+            gdbinit
 
 TESTS = check-guile
 TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
diff --git a/libguile/_scm.h b/libguile/_scm.h
index 5b4f3b7..a5c2ba8 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -3,7 +3,8 @@
 #ifndef SCM__SCM_H
 #define SCM__SCM_H
 
-/* Copyright (C) 1995,1996,2000,2001, 2002, 2006, 2008, 2009, 2010, 2011 Free 
Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 2000, 2001, 2002, 2006, 2008, 2009, 2010,
+ *   2011, 2013 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
@@ -93,18 +94,17 @@
 #ifdef vms
 # ifndef __GNUC__
 #  include <ssdef.h>
-#   define SCM_SYSCALL(line)                                    \
-  do                                                            \
-    {                                                           \
-      errno = 0;                                                \
-      line;                                                     \
-      if (EVMSERR==errno && (vaxc$errno>>3)==(SS$_CONTROLC>>3)) \
-        {                                                       \
-          SCM_ASYNC_TICK;                                       \
-          continue;                                             \
-        }                                                       \
-    }                                                           \
-  while(0)
+#   define SCM_SYSCALL(line)                                           \
+  do                                                                   \
+    {                                                                  \
+      errno = 0;                                                       \
+      line;                                                            \
+      if (EVMSERR == errno && (vaxc$errno>>3)==(SS$_CONTROLC>>3))      \
+       SCM_ASYNC_TICK;                                                 \
+      else                                                             \
+       break;                                                          \
+    }                                                                  \
+  while (1)
 # endif /* ndef __GNUC__ */
 #endif /* def vms */
 #endif /* ndef SCM_SYSCALL  */
@@ -112,18 +112,18 @@
 #ifndef SCM_SYSCALL
 # ifdef EINTR
 #  if (EINTR > 0)
-#   define SCM_SYSCALL(line)                    \
-  do                                            \
-    {                                           \
-      errno = 0;                                \
-      line;                                     \
-      if (errno == EINTR)                       \
-        {                                       \
-          SCM_ASYNC_TICK;                       \
-          continue;                             \
-        }                                       \
-    }                                           \
-  while(0)
+#   define SCM_SYSCALL(line)                   \
+  do                                           \
+    {                                          \
+      errno = 0;                               \
+      line;                                    \
+      if (errno == EINTR)                      \
+       {                                       \
+         SCM_ASYNC_TICK;                       \
+         errno = EINTR;                        \
+       }                                       \
+    }                                          \
+  while (errno == EINTR)
 #  endif /*  (EINTR > 0) */
 # endif /* def EINTR */
 #endif /* ndef SCM_SYSCALL */


hooks/post-receive
-- 
GNU Guile