about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2014-06-27 00:00:06 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-06-27 00:00:06 +0530
commit741711156782780e56a97988178cfa33541070df (patch)
tree80a08cc523b7086190497d49317801d4a37d5acc
parente64708de3674314ee73a490d9d3e36b59e61612a (diff)
downloadglibc-741711156782780e56a97988178cfa33541070df.tar.gz
glibc-741711156782780e56a97988178cfa33541070df.tar.xz
glibc-741711156782780e56a97988178cfa33541070df.zip
Remove inline keyword from leapyear function
This syncs up the code with gnulib.
-rw-r--r--ChangeLog5
-rw-r--r--time/mktime.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b26a77710..506eaedee2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-26  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* time/mktime.c (leapyear): Remove inline keyword.  The code is now
+	identical to gnulib mktime.
+
 2014-06-26  Joseph Myers  <joseph@codesourcery.com>
 
 	* configure.ac: Do not test for machine being rs6000.  Do not test
diff --git a/time/mktime.c b/time/mktime.c
index 963e4b985a..f10e5301de 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -142,7 +142,7 @@ verify (twos_complement_arithmetic,
 verify (base_year_is_a_multiple_of_100, TM_YEAR_BASE % 100 == 0);
 
 /* Return 1 if YEAR + TM_YEAR_BASE is a leap year.  */
-static inline int
+static int
 leapyear (long_int year)
 {
   /* Don't add YEAR to TM_YEAR_BASE, as that might overflow.