git-git: Rebase the msysgit patches

This commit is contained in:
Ray Donnelly
2014-10-10 00:18:41 +01:00
parent c118b79423
commit 5cc01a11b7
16 changed files with 109 additions and 134 deletions

View File

@@ -1,4 +1,4 @@
From b551d6199014c99982e121f4948bf1db7147ca1d Mon Sep 17 00:00:00 2001
From 5680be1e782505c7f7fb8119ec0772d2b1c377dd Mon Sep 17 00:00:00 2001
From: martell <martellmalone@gmail.com>
Date: Thu, 24 Jul 2014 01:29:13 +0100
Subject: [PATCH 13/15] Remove custom pthread layer
@@ -13,10 +13,10 @@ Subject: [PATCH 13/15] Remove custom pthread layer
delete mode 100644 compat/win32/pthread.h
diff --git a/compat/mingw.c b/compat/mingw.c
index 69ea532..d21fc56 100644
index 0604c62..34e20d9 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1074,6 +1074,11 @@ int pipe(int filedes[2])
@@ -745,6 +745,11 @@ int pipe(int filedes[2])
return 0;
}
@@ -249,10 +249,10 @@ index 8ad1873..0000000
-
-#endif /* PTHREAD_H */
diff --git a/config.mak.uname b/config.mak.uname
index cef8974..acd4f19 100644
index 95a092e..8646382 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -505,7 +505,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
@@ -512,7 +512,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
endif
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
@@ -262,5 +262,5 @@ index cef8974..acd4f19 100644
SOCKET_LIB = -lws2_32
GITLIBS += git.res
--
2.0.1
2.1.2