Merge branch 'jc/compat-util-setitimer-fix'

gitster · gitster · commit ecfc02df8574 · 2020-12-18T15:15:17.000-08:00
Fix a recent bug in a rarely used replacement code.

* jc/compat-util-setitimer-fix:
  compat-util: pretend that stub setitimer() always succeeds
diff --git a/git-compat-util.h b/git-compat-util.h
@@ -273,7 +273,7 @@ struct itimerval {
 
 #ifdef NO_SETITIMER
 static inline int setitimer(int which, const struct itimerval *value, struct itimerval *newvalue) {
-	; /* nothing */
+	return 0; /* pretend success */
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ struct itimerval {`
`273`	`273`
`274`	`274`	`#ifdef NO_SETITIMER`
`275`	`275`	`static inline int setitimer(int which, const struct itimerval value, struct itimerval newvalue) {`
`276`		`- ; /* nothing */`
	`276`	`+ return 0; /* pretend success */`
`277`	`277`	`}`
`278`	`278`	`#endif`
`279`	`279`