xdiff: move sign comparison warning guard into each file

davvid · gitster · commit 9d16f8958467 · 2025-02-12T09:41:15.000-08:00
Allow each file to fix the warnings guarded by the macro separately by
moving the definition from the shared xinclude.h into each file that
needs it.

xmerge.c and xprepare.c do not contain any signed vs. unsigned
comparisons so the definition was not included in these files.

Signed-off-by: David Aguilar &lt;davvid@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/xdiff/xemit.c b/xdiff/xemit.c
@@ -20,6 +20,8 @@
  *
  */
 
+#define DISABLE_SIGN_COMPARE_WARNINGS
+
 #include "xinclude.h"
 
 static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec) {
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c
@@ -41,6 +41,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define DISABLE_SIGN_COMPARE_WARNINGS
+
 #include "xinclude.h"
 
 #define MAX_PTR	UINT_MAX
diff --git a/xdiff/xinclude.h b/xdiff/xinclude.h
@@ -23,8 +23,6 @@
 #if !defined(XINCLUDE_H)
 #define XINCLUDE_H
 
-#define DISABLE_SIGN_COMPARE_WARNINGS
-
 #include "git-compat-util.h"
 #include "xmacros.h"
 #include "xdiff.h"
diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c
@@ -19,6 +19,9 @@
  *  Davide Libenzi <davidel@xmailserver.org>
  *
  */
+
+#define DISABLE_SIGN_COMPARE_WARNINGS
+
 #include "xinclude.h"
 
 /*
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
@@ -20,6 +20,8 @@
  *
  */
 
+#define DISABLE_SIGN_COMPARE_WARNINGS
+
 #include "xinclude.h"
 
 

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`*`
`21`	`21`	`*/`
`22`	`22`
	`23`	`+#define DISABLE_SIGN_COMPARE_WARNINGS`
	`24`	`+`
`23`	`25`	`#include "xinclude.h"`
`24`	`26`
`25`	`27`	`static long xdl_get_rec(xdfile_t xdf, long ri, char const *rec) {`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@`
`19`	`19`	`* Davide Libenzi <[email protected]>`
`20`	`20`	`*`
`21`	`21`	`*/`
	`22`	`+`
	`23`	`+#define DISABLE_SIGN_COMPARE_WARNINGS`
	`24`	`+`
`22`	`25`	`#include "xinclude.h"`
`23`	`26`
`24`	`27`	`/*`