Skip to content

Commit 7b304ab

Browse files
committed
Merge branch 'cb/no-more-gmtime'
Code clean-up by removing a compatibility implementation of a function we no longer use. * cb/no-more-gmtime: compat: remove gmtime
2 parents 74c6cba + 84b0115 commit 7b304ab

File tree

4 files changed

+0
-45
lines changed

4 files changed

+0
-45
lines changed

Makefile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -399,9 +399,6 @@ all::
399399
# with a different indexfile format version. If it isn't set the index
400400
# file format used is index-v[23].
401401
#
402-
# Define GMTIME_UNRELIABLE_ERRORS if your gmtime() function does not
403-
# return NULL when it receives a bogus time_t.
404-
#
405402
# Define HAVE_CLOCK_GETTIME if your platform has clock_gettime.
406403
#
407404
# Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC.
@@ -1809,11 +1806,6 @@ ifndef NO_MSGFMT_EXTENDED_OPTIONS
18091806
MSGFMT += --check --statistics
18101807
endif
18111808

1812-
ifdef GMTIME_UNRELIABLE_ERRORS
1813-
COMPAT_OBJS += compat/gmtime.o
1814-
BASIC_CFLAGS += -DGMTIME_UNRELIABLE_ERRORS
1815-
endif
1816-
18171809
ifdef HAVE_CLOCK_GETTIME
18181810
BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
18191811
endif

compat/gmtime.c

Lines changed: 0 additions & 29 deletions
This file was deleted.

config.mak.uname

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ ifeq ($(uname_S),FreeBSD)
246246
PYTHON_PATH = /usr/local/bin/python
247247
PERL_PATH = /usr/local/bin/perl
248248
HAVE_PATHS_H = YesPlease
249-
GMTIME_UNRELIABLE_ERRORS = UnfortunatelyYes
250249
HAVE_BSD_SYSCTL = YesPlease
251250
HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
252251
PAGER_ENV = LESS=FRX LV=-c MORE=FRX

git-compat-util.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,13 +1216,6 @@ int access_or_die(const char *path, int mode, unsigned flag);
12161216
/* Warn on an inaccessible file if errno indicates this is an error */
12171217
int warn_on_fopen_errors(const char *path);
12181218

1219-
#ifdef GMTIME_UNRELIABLE_ERRORS
1220-
struct tm *git_gmtime(const time_t *);
1221-
struct tm *git_gmtime_r(const time_t *, struct tm *);
1222-
#define gmtime git_gmtime
1223-
#define gmtime_r git_gmtime_r
1224-
#endif
1225-
12261219
#if !defined(USE_PARENS_AROUND_GETTEXT_N) && defined(__GNUC__)
12271220
#define USE_PARENS_AROUND_GETTEXT_N 1
12281221
#endif

0 commit comments

Comments
 (0)