diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-12 14:21:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-12 14:21:44 -0700 |
| commit | 067a1f552ee5ac8faf24aa547808b10bc54fae4b (patch) | |
| tree | a5bb801f84c528dbd4df5f1645adef9cf11b9d34 | |
| parent | e15f390b154a7d703ac62e4cc84bf720eda74e2c (diff) | |
| parent | 7f9e848cf82311792ccfb286e64846fe6f3d5476 (diff) | |
| download | git-067a1f552ee5ac8faf24aa547808b10bc54fae4b.tar.gz | |
Merge branch 'js/compat-itimer'
Pieces to support compilation on __TANDEM.
* js/compat-itimer:
Add a no-op setitimer() wrapper
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | git-compat-util.h | 11 |
2 files changed, 23 insertions, 0 deletions
@@ -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 diff --git a/git-compat-util.h b/git-compat-util.h index fd732d7243..24b5432462 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -167,6 +167,17 @@ extern int compat_mkdir_wo_trailing_slash(const char*, mode_t); #endif +#ifdef NO_STRUCT_ITIMERVAL +struct itimerval { + struct timeval it_interval; + struct timeval it_value; +} +#endif + +#ifdef NO_SETITIMER +#define setitimer(which,value,ovalue) +#endif + #ifndef NO_LIBGEN_H #include <libgen.h> #else |