kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'cb/mingw-gmtime-r' 

Build fix on Windows.

* cb/mingw-gmtime-r:
  mingw: avoid fallback for {local,gm}time_r()
maint
Junio C Hamano 2021-12-10 14:35:15 -08:00
parent 4b1197ab5a 9e12400da8
commit 25be7ec4bf
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compat/mingw.c
View File

@ -1083,6 +1083,7 @@ int pipe(int filedes[2])
return 0; return 0;
} }


#ifndef __MINGW64__
struct tm *gmtime_r(const time_t *timep, struct tm *result) struct tm *gmtime_r(const time_t *timep, struct tm *result)
{ {
if (gmtime_s(result, timep) == 0) if (gmtime_s(result, timep) == 0)
@ -1096,6 +1097,7 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)
return result; return result;
return NULL; return NULL;
} }
#endif


char *mingw_getcwd(char *pointer, int len) char *mingw_getcwd(char *pointer, int len)
{ {

4
git-compat-util.h
View File

@ -148,7 +148,9 @@
/* Approximation of the length of the decimal representation of this type. */ /* Approximation of the length of the decimal representation of this type. */
#define decimal_length(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1) #define decimal_length(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1)


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