Skip to content

Commit 0d6923f

Browse files
authored
Merge pull request #3398 from carenas/pthread-unistd
mingw: avoid fallback for {local,gm}time_r()
2 parents 8735530 + 9e52042 commit 0d6923f

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

compat/mingw.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,6 +1298,7 @@ int pipe(int filedes[2])
12981298
return 0;
12991299
}
13001300

1301+
#ifndef __MINGW64__
13011302
struct tm *gmtime_r(const time_t *timep, struct tm *result)
13021303
{
13031304
if (gmtime_s(result, timep) == 0)
@@ -1311,6 +1312,7 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)
13111312
return result;
13121313
return NULL;
13131314
}
1315+
#endif
13141316

13151317
char *mingw_strbuf_realpath(struct strbuf *resolved, const char *path)
13161318
{

git-compat-util.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,9 @@
127127
/* Approximation of the length of the decimal representation of this type. */
128128
#define decimal_length(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1)
129129

130-
#if defined(__sun__)
130+
#ifdef __MINGW64__
131+
#define _POSIX_C_SOURCE 1
132+
#elif defined(__sun__)
131133
/*
132134
* On Solaris, when _XOPEN_EXTENDED is set, its header file
133135
* forces the programs to be XPG4v2, defeating any _XOPEN_SOURCE

0 commit comments

Comments
 (0)