summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-03 12:06:42 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-03 12:06:42 -0700
commit53f52cd92acb033df4a50d1557bae9c55c2d4d67 (patch)
tree0a85e770f5ec72c29a98cff41c9385246e407524 /Makefile
parent9af098c29b2faa89225556258ae0e3676741c981 (diff)
parent39539495acb24abfb4dee551e3e9f2e696be7abf (diff)
downloadgit-53f52cd92acb033df4a50d1557bae9c55c2d4d67.tar.gz
Merge branch 'nd/index-pack-one-fd-per-thread'
Enable threaded index-pack on platforms without thread-unsafe pread() emulation. * 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 1f5d924408..08fc9ca430 100644
--- a/Makefile
+++ b/Makefile
@@ -185,9 +185,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.
#
@@ -1345,10 +1342,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