[PATCH 1/6] xdiff: move sign comparison warning guard into each file

From: David Aguilar <davvid@gmail.com>
Date: Feb 12, 2025, 06:04 UTC
Message-ID: <20250212060418.1645241-1-davvid@gmail.com>

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 <davvid@gmail.com>
---
 xdiff/xemit.c      | 2 ++
 xdiff/xhistogram.c | 2 ++
 xdiff/xinclude.h   | 2 --
 xdiff/xpatience.c  | 3 +++
 xdiff/xutils.c     | 2 ++
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 75f0fe4986..2b394a4806 100644
--- 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
index 16a8fe2f3f..3d2b190fa6 100644
--- 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
index 7e56542526..a4285ac0eb 100644
--- 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
index a2d8955537..b0ba421b28 100644
--- 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
index 9e36f24875..169edff5ab 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -20,6 +20,8 @@
  *
  */
 
+#define DISABLE_SIGN_COMPARE_WARNINGS
+
 #include "xinclude.h"

-- 
2.48.1.643.g61982db19f