projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid macro redefinition warnings.
[gnulib.git]
/
lib
/
timegm.c
diff --git
a/lib/timegm.c
b/lib/timegm.c
index
dd29992
..
67230cf
100644
(file)
--- a/
lib/timegm.c
+++ b/
lib/timegm.c
@@
-1,7
+1,7
@@
/* Convert UTC calendar time to simple time. Like mktime but assumes UTC.
/* Convert UTC calendar time to simple time. Like mktime but assumes UTC.
- Copyright (C) 1994, 1997, 2003, 2004
Free Software Foundation, Inc.
- This file is part of the GNU C Library.
+ Copyright (C) 1994, 1997, 2003, 2004
, 2006, 2007 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
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
@@
-15,17
+15,15
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
-#if
def HAVE_CONFIG_H
+#if
ndef _LIBC
# include <config.h>
#endif
# 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
# define __mktime_internal mktime_internal
# undef __gmtime_r
# define __gmtime_r gmtime_r
# define __mktime_internal mktime_internal