[Emacs-diffs] master 8a147fb: Pacify --enable-gcc-warnings CANNOT_DUMP=yes

[Paul Eggert]

branch: master
commit 8a147fb24681cd5b89b99376c95baf785dd5126f
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Pacify --enable-gcc-warnings CANNOT_DUMP=yes
    
    * src/editfns.c (dump_tz_string) [CANNOT_DUMP || !HAVE_TZSET]:
    Do not define.  If defining, do it in a smaller scope.
---
 src/editfns.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/editfns.c b/src/editfns.c
index 72c7a9c..6ea8cba 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -87,10 +87,6 @@ static timezone_t local_tz;
 static timezone_t wall_clock_tz;
 static timezone_t const utc_tz = 0;
 
-/* A valid but unlikely setting for the TZ environment variable.
-   It is OK (though a bit slower) if the user chooses this value.  */
-static char dump_tz_string[] = "TZ=UtC0";
-
 /* The cached value of Vsystem_name.  This is used only to compare it
    to Vsystem_name, so it need not be visible to the GC.  */
 static Lisp_Object cached_system_name;
@@ -230,6 +226,12 @@ tzlookup (Lisp_Object zone, bool settz)
 void
 init_editfns (bool dumping)
 {
+#if !defined CANNOT_DUMP && defined HAVE_TZSET
+  /* A valid but unlikely setting for the TZ environment variable.
+     It is OK (though a bit slower) if the user chooses this value.  */
+  static char dump_tz_string[] = "TZ=UtC0";
+#endif
+
   const char *user_name;
   register char *p;
   struct passwd *pw;   /* password entry for the current user */