Skip to content

Commit 1c52e06

Browse files
dschoGit for Windows Build Agent
authored and
Git for Windows Build Agent
committed
fixup??? compat/mingw: handle WSA errors in strerror
Merge conflict resolutions that are outside of any conflict marker are not recorded by `git rerere`. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 2d2a9b7 commit 1c52e06

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

compat/mingw-posix.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,11 @@ int mingw_socket(int domain, int type, int protocol);
292292
int mingw_connect(int sockfd, struct sockaddr *sa, size_t sz);
293293
#define connect mingw_connect
294294

295+
char *mingw_strerror(int errnum);
296+
#ifndef _UCRT
297+
#define strerror mingw_strerror
298+
#endif
299+
295300
int mingw_bind(int sockfd, struct sockaddr *sa, size_t sz);
296301
#define bind mingw_bind
297302

0 commit comments

Comments
 (0)