Make at least the header aliasing safe.

[simgear.git] / simgear / timing / lowleveltime.cxx

diff --git a/simgear/timing/lowleveltime.cxx b/simgear/timing/lowleveltime.cxx
index 2ae1570087b6433434d6c26d560fc8715a75952b..9aa4e459a6eee07e60d83d563763ec204023b833 100644 (file)
--- a/simgear/timing/lowleveltime.cxx
+++ b/simgear/timing/lowleveltime.cxx
@@ -2,19 +2,19 @@
  * Written by various people (I"ll look up the exact credits later)
  * Modified by Durk Talsma, July 1999 for use in FlightGear
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Library General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  **************************************************************************/
 
@@ -285,10 +285,10 @@ static void fgtzset_internal (int always, const char *tz)
   time(&now);
   static int is_initialized = 0;
   //register const char *tz;
-  register size_t l;
-  char *tzbuf;
-  unsigned short int hh, mm, ss;
-  unsigned short int whichrule;
+  // register size_t l;
+  // char *tzbuf;
+  // unsigned short int hh, mm, ss;
+  // unsigned short int whichrule;
 
   if (is_initialized && !always)
     return;
@@ -303,7 +303,7 @@ static void fgtzset_internal (int always, const char *tz)
     /* User specified the empty string; use UTC explicitly.  */
     tz = "Universal";
 
-#ifdef MACOS
+#ifdef macintosh
   /* as you well know, mac paths contain leading colon, this code
      messes things up.... */
 #else
@@ -789,7 +789,7 @@ static struct ttinfo * fgfind_transition (time_t timer)
 /**************************************************************************/
 void fgtzfile_read (const char *file)
 {
-  static const char default_tzdir[] = TZDIR;
+  // static const char default_tzdir[] = TZDIR;
   size_t num_isstd, num_isgmt;
   register FILE *f;
   struct tzhead tzhead;
@@ -861,8 +861,12 @@ void fgtzfile_read (const char *file)
 //     }
 
   f = fopen (file, "rb");
-  if (f == NULL)
-    return;
+
+  if (f == NULL) {
+      perror( "fgtzfile_read(): " );
+      errno = 0;
+      return;
+  }
 
   if (fread ((void *) &tzhead, sizeof (tzhead), 1, f) != 1)
     goto lose;
@@ -993,7 +997,7 @@ void fgtzfile_read (const char *file)
 /****************************************************************************/
 static void fgcompute_tzname_max (size_t chars)
 {
-  extern size_t tzname_cur_max; /* Defined in tzset.c. */
+  // extern size_t tzname_cur_max; /* Defined in tzset.c. */
 
   const char *p;