[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.12-9-g5093bed

[by Werner Koch]

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 "The GNU Privacy Guard".

The branch, STABLE-BRANCH-1-4 has been updated
       via  5093bed27580e608de073bcc5953bd76b6b8b2de (commit)
       via  bb4df020fe1c50698aab8c9bf6b11bc3725f785d (commit)
      from  a1856e767ac4cefe3252211a81ef479f6e3e4e5f (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 5093bed27580e608de073bcc5953bd76b6b8b2de
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Nov 6 17:14:04 2012 +0100

    Fix extern inline use for gcc > 4.3 in c99 mode
    
    * mpi/mpi-inline.h [!G10_MPI_INLINE_DECL]: Take care of changed extern
    inline semantics in gcc.
    --
    
    I am not use how this will work out with non-gcc. However, we had no
    problems in the past and thus this change is the least invasive for
    non-gcc compilers.

diff --git a/mpi/mpi-inline.h b/mpi/mpi-inline.h
index c32adae..6e44518 100644
--- a/mpi/mpi-inline.h
+++ b/mpi/mpi-inline.h
@@ -28,8 +28,15 @@
 #ifndef G10_MPI_INLINE_H
 #define G10_MPI_INLINE_H
 
+/* Starting with gcc 4.3 "extern inline" conforms in c99 mode to the
+   c99 semantics.  To keep the useful old semantics we use an
+   attribute.  */
 #ifndef G10_MPI_INLINE_DECL
-#define G10_MPI_INLINE_DECL  extern __inline__
+# ifdef __GNUC_STDC_INLINE__
+#  define G10_MPI_INLINE_DECL  extern inline __attribute__ ((__gnu_inline__))
+# else
+#  define G10_MPI_INLINE_DECL  extern __inline__
+# endif
 #endif
 
 G10_MPI_INLINE_DECL  mpi_limb_t

commit bb4df020fe1c50698aab8c9bf6b11bc3725f785d
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Nov 6 16:21:52 2012 +0100

    autogen.sh: Do not use -c with chmod.
    
    --

diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index d820696..6423483 100755
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -272,14 +272,14 @@ if [ -d .git ]; then
     and .git/hooks/pre-commit.sample out of the way.
 EOF
       cp -av .git/hooks/pre-commit.sample .git/hooks/pre-commit
-      chmod -c +x  .git/hooks/pre-commit
+      chmod +x  .git/hooks/pre-commit
   fi
   if [ -f scripts/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
     cat <<EOF >&2
 *** Activating commit log message check hook. ***
 EOF
       cp -av scripts/git-hooks/commit-msg .git/hooks/commit-msg
-      chmod -c +x  .git/hooks/commit-msg
+      chmod +x  .git/hooks/commit-msg
   fi
   tmp=$(git config --get filter.cleanpo.clean)
   if [ "$tmp" != "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]

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

Summary of changes:
 mpi/mpi-inline.h   |    9 ++++++++-
 scripts/autogen.sh |    4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org