[Guile-commits] GNU Guile branch, branch_release-1-8, updated. release_1-8-6-58-g0367cb9

[Neil Jerram]

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=0367cb9d56601b627b361191d0a6e7e3892f1de7

The branch, branch_release-1-8 has been updated
       via  0367cb9d56601b627b361191d0a6e7e3892f1de7 (commit)
      from  a5cb5305027f5850db3f26a8094aea608a2db19c (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 0367cb9d56601b627b361191d0a6e7e3892f1de7
Author: Neil Jerram <address@hidden>
Date:   Sun Jun 21 17:41:53 2009 +0100

    Fix MinGW build warning caused by tzname redeclaration
    
    The warning is:
    stime.c:85: warning: `tzname' redeclared without dllimport attribute: 
previous dllimport ignored
    
    The second half of this section of #ifdefery implies that the MinGW
    build isn't going to reference a function called `tzname' anyway
    (because it's going to use `_tzname' instead).  So why should a MinGW
    build want any declaration of `tzname' at all?
    
    As far as a declaration of `_tzname' is concerned, there are no
    more #includes after this, so we must have already got a declaration
    of `_tzname' from one of the preceding includes.
    
    * libguile/stime.c (tzname): Remove declaration in __MINGW32__ build.
      It isn't needed and causes a build warning.

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

Summary of changes:
 libguile/stime.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libguile/stime.c b/libguile/stime.c
index bf5b9ff..31435c9 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -80,11 +80,12 @@
 #include <crt_externs.h>  /* for Darwin _NSGetEnviron */
 #endif
 
+#if defined (__MINGW32__)
+# define tzname _tzname
+#else
 #ifndef tzname /* For SGI.  */
 extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
 #endif
-#if defined (__MINGW32__)
-# define tzname _tzname
 #endif
 
 #if ! HAVE_DECL_STRPTIME


hooks/post-receive
-- 
GNU Guile