aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-12 14:21:44 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-12 14:21:44 -0700
commit067a1f552ee5ac8faf24aa547808b10bc54fae4b (patch)
treea5bb801f84c528dbd4df5f1645adef9cf11b9d34 /Makefile
parente15f390b154a7d703ac62e4cc84bf720eda74e2c (diff)
parent7f9e848cf82311792ccfb286e64846fe6f3d5476 (diff)
downloadgit-067a1f552ee5ac8faf24aa547808b10bc54fae4b.tar.gz
git-067a1f552ee5ac8faf24aa547808b10bc54fae4b.tar.xz
Merge branch 'js/compat-itimer'
Pieces to support compilation on __TANDEM. * js/compat-itimer: Add a no-op setitimer() wrapper
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 12 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 99157da2d..56301dc0a 100644
--- a/Makefile
+++ b/Makefile
@@ -159,6 +159,11 @@ all::
# Define NO_PREAD if you have a problem with pread() system call (e.g.
# cygwin1.dll before v1.5.22).
#
+# Define NO_SETITIMER if you don't have setitimer()
+#
+# 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)
#
@@ -1677,6 +1682,13 @@ endif
ifdef OBJECT_CREATION_USES_RENAMES
COMPAT_CFLAGS += -DOBJECT_CREATION_MODE=1
endif
+ifdef NO_STRUCT_ITIMERVAL
+ COMPAT_CFLAGS += -DNO_STRUCT_ITIMERVAL
+ NO_SETITIMER=YesPlease
+endif
+ifdef NO_SETITIMER
+ COMPAT_CFLAGS += -DNO_SETITIMER
+endif
ifdef NO_PREAD
COMPAT_CFLAGS += -DNO_PREAD
COMPAT_OBJS += compat/pread.o