aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-25 11:47:58 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-25 11:47:58 -0700
commita9041df7ab712be1bfad9e6b67bf4cbf0f7c9c9b (patch)
tree435a8e2266bc401054359ce857e3d7667c47289f /Makefile
parent75b1b04c63e3dfa02fd71caa95c17ed2c3b43050 (diff)
parent39539495acb24abfb4dee551e3e9f2e696be7abf (diff)
downloadgit-a9041df7ab712be1bfad9e6b67bf4cbf0f7c9c9b.tar.gz
git-a9041df7ab712be1bfad9e6b67bf4cbf0f7c9c9b.tar.xz
Merge branch 'nd/index-pack-one-fd-per-thread' into maint
We used to disable threaded "git index-pack" on platforms without thread-safe pread(); use a different workaround for such platforms to allow threaded "git index-pack". * nd/index-pack-one-fd-per-thread: index-pack: work around thread-unsafe pread()
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 0 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index a53f3a832..e0caec3f6 100644
--- a/Makefile
+++ b/Makefile
@@ -183,9 +183,6 @@ all::
# Define NO_STRUCT_ITIMERVAL if you don't have struct itimerval
# This also implies NO_SETITIMER
#
-# Define NO_THREAD_SAFE_PREAD if your pread() implementation is not
-# thread-safe. (e.g. compat/pread.c or cygwin)
-#
# Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is
# generally faster on your platform than accessing the working directory.
#
@@ -1339,10 +1336,6 @@ endif
ifdef NO_PREAD
COMPAT_CFLAGS += -DNO_PREAD
COMPAT_OBJS += compat/pread.o
- NO_THREAD_SAFE_PREAD = YesPlease
-endif
-ifdef NO_THREAD_SAFE_PREAD
- BASIC_CFLAGS += -DNO_THREAD_SAFE_PREAD
endif
ifdef NO_FAST_WORKING_DIRECTORY
BASIC_CFLAGS += -DNO_FAST_WORKING_DIRECTORY