diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-19 16:31:24 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-19 16:31:24 -0700 |
| commit | 562d4436bce90adc8535aeb2b9b1517952ee67ad (patch) | |
| tree | 5f0e3326cb58d26d69af7e30714ecf4c13d88f73 /lib/mktime.c | |
| parent | b69a6d228467365b4ed2545dcb1ecc3582d20e2a (diff) | |
| download | emacs-562d4436bce90adc8535aeb2b9b1517952ee67ad.tar.gz emacs-562d4436bce90adc8535aeb2b9b1517952ee67ad.tar.bz2 emacs-562d4436bce90adc8535aeb2b9b1517952ee67ad.zip | |
Merge from gnulib.
2012-08-19 ignore-value, stat-time, timespec: omit AC_C_INLINE
2012-08-19 mktime, sys_select: avoid 'static inline'
2012-08-19 gnulib-tool: Fix indentation.
Diffstat (limited to 'lib/mktime.c')
| -rw-r--r-- | lib/mktime.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mktime.c b/lib/mktime.c index 952c82983bb..74d1b84949b 100644 --- a/lib/mktime.c +++ b/lib/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. @@ -196,7 +196,7 @@ isdst_differ (int a, int b) The result may overflow. It is the caller's responsibility to detect overflow. */ -static inline time_t +static time_t ydhms_diff (long_int year1, long_int yday1, int hour1, int min1, int sec1, int year0, int yday0, int hour0, int min0, int sec0) { |