From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Sep 2012 21:21:44 +0000 (-0700)
Subject: Merge branch 'js/compat-itimer'
X-Git-Tag: v1.8.0-rc0~71
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=067a1f552ee5ac8faf24aa547808b10bc54fae4b;p=git.git

Merge branch 'js/compat-itimer'

Pieces to support compilation on __TANDEM.

* js/compat-itimer:
  Add a no-op setitimer() wrapper
---

067a1f552ee5ac8faf24aa547808b10bc54fae4b
diff --cc git-compat-util.h
index fd732d724,3515366b1..24b543246
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -162,11 -162,17 +162,22 @@@
  #define probe_utf8_pathname_composition(a,b)
  #endif
  
 +#ifdef MKDIR_WO_TRAILING_SLASH
 +#define mkdir(a,b) compat_mkdir_wo_trailing_slash((a),(b))
 +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