From e4e0a2468c78f67ea5ba356d71f2f1983b53b1c4 Mon Sep 17 00:00:00 2001
From: Hirohito Higashi <h.east.727@gmail.com>
Date: Wed, 19 Mar 2025 20:25:21 +0100
Subject: [PATCH] patch 9.1.1225: extra NULL check in VIM_CLEAR()

Problem:  extra NULL check in VIM_CLEAR()
Solution: remove the NULL check and rely on the NULL check in vim_free()
          instead (Hirohito Higashi).

closes: #16936

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
---
 src/macros.h  | 7 ++-----
 src/version.c | 2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/macros.h b/src/macros.h
index 86ae33b4a..6c2931a29 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -360,11 +360,8 @@
  */
 #define VIM_CLEAR(p) \
     do { \
-	if ((p) != NULL) \
-	{ \
-	    vim_free(p); \
-	    (p) = NULL; \
-	} \
+	vim_free(p); \
+	(p) = NULL; \
     } while (0)
 
 /*
diff --git a/src/version.c b/src/version.c
index 02f30abf3..aab2ea560 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1225,
 /**/
     1224,
 /**/