X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ftimegm.c;h=e80a90a5a21d03e7bffdbd1037869b0eb58b5447;hb=7ef6c64e210ac0979d7e8ac69bc5b5208c2405ab;hp=8072cb4677ea16a4177313b00d40dab1219cd0f1;hpb=7b224479dcac36108cbf435aff9b45767143ed25;p=gnulib.git

diff --git a/lib/timegm.c b/lib/timegm.c
index 8072cb467..e80a90a5a 100644
--- a/lib/timegm.c
+++ b/lib/timegm.c
@@ -1,7 +1,7 @@
 /* Convert UTC calendar time to simple time.  Like mktime but assumes UTC.
 
-   Copyright (C) 1994, 1997, 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
+   Copyright (C) 1994, 1997, 2003-2004, 2006-2007, 2009-2014 Free Software
+   Foundation, Inc.  This file is part of the GNU C Library.
 
    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
@@ -14,23 +14,19 @@
    GNU 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
 # include <config.h>
 #endif
 
-#ifdef _LIBC
-# include <time.h>
-#else
-# include "timegm.h"
-# include <time_r.h>
+#include <time.h>
+
+#ifndef _LIBC
 # undef __gmtime_r
 # define __gmtime_r gmtime_r
-time_t __mktime_internal (struct tm *,
-			  struct tm * (*) (time_t const *, struct tm *),
-			  time_t *);
+# define __mktime_internal mktime_internal
+# include "mktime-internal.h"
 #endif
 
 time_t