From 5d9306fed35babfe0061ae31e7f90d5228367203 Mon Sep 17 00:00:00 2001
From: polluks2 <74630735+polluks2@users.noreply.github.com>
Date: Fri, 12 May 2023 02:32:14 +0200
Subject: [PATCH 01/11] Fixed header #2110

---
 include/stdlib.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/stdlib.h b/include/stdlib.h
index 4e7ffbd6a..05148d7da 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -44,6 +44,12 @@ typedef unsigned size_t;
 #define _HAVE_size_t
 #endif
 
+/* NULL pointer */
+#ifndef _HAVE_NULL
+#define NULL    ((void *) 0)
+#define _HAVE_NULL
+#endif
+
 /* Standard exit codes */
 #define EXIT_SUCCESS    0
 #define EXIT_FAILURE    1
@@ -167,6 +173,3 @@ int __fastcall__ putenv (char* s);
 
 /* End of stdlib.h */
 #endif
-
-
-

From 6579df4e91981e0516da5216e7cb9a8b82a288b9 Mon Sep 17 00:00:00 2001
From: polluks2 <74630735+polluks2@users.noreply.github.com>
Date: Sun, 14 May 2023 02:43:35 +0200
Subject: [PATCH 02/11] Update stdlib.h

---
 include/stdlib.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/stdlib.h b/include/stdlib.h
index 05148d7da..e789f732b 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -45,9 +45,8 @@ typedef unsigned size_t;
 #endif
 
 /* NULL pointer */
-#ifndef _HAVE_NULL
-#define NULL    ((void *) 0)
-#define _HAVE_NULL
+#ifndef NULL
+#define NULL ((void *) 0)
 #endif
 
 /* Standard exit codes */

From 680ddaf37d034deededf7a9c814d7a9a6d3ee7c5 Mon Sep 17 00:00:00 2001
From: polluks2 <74630735+polluks2@users.noreply.github.com>
Date: Sun, 14 May 2023 17:27:04 +0200
Subject: [PATCH 03/11] Update locale.h

---
 include/locale.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/locale.h b/include/locale.h
index 3f23e01d2..f408e1ef3 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -39,9 +39,8 @@
 
 
 /* NULL pointer */
-#ifndef _HAVE_NULL
-#define NULL    0
-#define _HAVE_NULL
+#ifndef NULL
+#define NULL ((void *) 0)
 #endif
 
 /* Locale information constants */
@@ -82,6 +81,3 @@ char* __fastcall__ setlocale (int category, const char* locale);
 
 /* End of locale.h */
 #endif
-
-
-

From fd74e6b005bb2d5482310cb5286081065e750310 Mon Sep 17 00:00:00 2001
From: polluks2 <74630735+polluks2@users.noreply.github.com>
Date: Sun, 14 May 2023 17:28:09 +0200
Subject: [PATCH 04/11] Update stdio.h

---
 include/stdio.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/stdio.h b/include/stdio.h
index 858dd5059..012b8e2ba 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -38,9 +38,8 @@
 
 
 /* NULL pointer */
-#ifndef _HAVE_NULL
-#define NULL    0
-#define _HAVE_NULL
+#ifndef NULL
+#define NULL ((void *) 0)
 #endif
 
 /* size_t is needed */

From c55459b287ec0c5fddbb6c695ea14e7222db1052 Mon Sep 17 00:00:00 2001
From: polluks2 <74630735+polluks2@users.noreply.github.com>
Date: Sun, 14 May 2023 17:28:48 +0200
Subject: [PATCH 05/11] Update string.h

---
 include/string.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/string.h b/include/string.h
index 854359dad..abaf80e7d 100644
--- a/include/string.h
+++ b/include/string.h
@@ -37,9 +37,8 @@
 #define _STRING_H
 
 /* NULL pointer */
-#ifndef _HAVE_NULL
-#define NULL    0
-#define _HAVE_NULL
+#ifndef NULL
+#define NULL ((void *) 0)
 #endif
 
 /* size_t is needed */

From ba6747f5da0dd0c3c0cfab96098ad8cc4bfec11a Mon Sep 17 00:00:00 2001
From: polluks2 <74630735+polluks2@users.noreply.github.com>
Date: Sun, 14 May 2023 17:29:42 +0200
Subject: [PATCH 06/11] Update time.h

---
 include/time.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/time.h b/include/time.h
index 642d68c4e..bfc2ac435 100644
--- a/include/time.h
+++ b/include/time.h
@@ -39,9 +39,8 @@
 
 
 /* NULL pointer */
-#ifndef _HAVE_NULL
-#define NULL    0
-#define _HAVE_NULL
+#ifndef NULL
+#define NULL ((void *) 0)
 #endif
 
 /* size_t is needed */

From dd58c7ff5002ad1da1522c2764d60acac27a5546 Mon Sep 17 00:00:00 2001
From: polluks2 <74630735+polluks2@users.noreply.github.com>
Date: Sun, 14 May 2023 17:32:30 +0200
Subject: [PATCH 07/11] Update stddef.h

---
 include/stddef.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/stddef.h b/include/stddef.h
index ca93edf62..d2bfd6138 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -53,9 +53,8 @@ typedef unsigned size_t;
 #endif
 
 /* NULL pointer */
-#ifndef _HAVE_NULL
-#define NULL    ((void *) 0)
-#define _HAVE_NULL
+#ifndef NULL
+#define NULL ((void *) 0)
 #endif
 
 /* offsetof macro */
@@ -65,6 +64,3 @@ typedef unsigned size_t;
 
 /* End of stddef.h */
 #endif
-
-
-

From 19436f515938e4b16afc214073ff40f5e1e9a45e Mon Sep 17 00:00:00 2001
From: polluks2 <74630735+polluks2@users.noreply.github.com>
Date: Wed, 17 May 2023 20:24:36 +0200
Subject: [PATCH 08/11] Update gconst.h

---
 include/geos/gconst.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/geos/gconst.h b/include/geos/gconst.h
index e70eb9304..55a99a21f 100644
--- a/include/geos/gconst.h
+++ b/include/geos/gconst.h
@@ -4,14 +4,14 @@
   reassembled by Maciej 'YTM/Elysium' Witkowiak
 */
 
-/* Here are constants which didn't fit into any other cathegory... */
+/* Here are constants which didn't fit into any other category... */
 
 #ifndef _GCONST_H
 #define _GCONST_H
 
-#define NULL            0
-#define FALSE           NULL
+#define NULL            ((void *) 0)
 #define TRUE            0xff
+#define FALSE           ~TRUE
 #define MOUSE_SPRNUM    0
 #define DISK_DRV_LGH    0x0d80
 

From 767875b5a73f5630e75fe60a70473a17dda6a10f Mon Sep 17 00:00:00 2001
From: polluks2 <74630735+polluks2@users.noreply.github.com>
Date: Thu, 18 May 2023 00:08:26 +0200
Subject: [PATCH 09/11] Added guard

---
 include/geos/gconst.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/geos/gconst.h b/include/geos/gconst.h
index 55a99a21f..a1b6a1d86 100644
--- a/include/geos/gconst.h
+++ b/include/geos/gconst.h
@@ -9,7 +9,9 @@
 #ifndef _GCONST_H
 #define _GCONST_H
 
+#ifndef NULL
 #define NULL            ((void *) 0)
+#endif
 #define TRUE            0xff
 #define FALSE           ~TRUE
 #define MOUSE_SPRNUM    0

From 8ff008722b97790fa65aa464b01107b8ba58967d Mon Sep 17 00:00:00 2001
From: polluks2 <74630735+polluks2@users.noreply.github.com>
Date: Fri, 19 May 2023 02:49:49 +0200
Subject: [PATCH 10/11] Fixed test

Don't define NULL yourself. QED
---
 test/val/add4.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/val/add4.c b/test/val/add4.c
index f02a7fb9c..2371aea69 100644
--- a/test/val/add4.c
+++ b/test/val/add4.c
@@ -22,7 +22,6 @@ long long0 = 0;
 long long1 = 0;
 unsigned long ulong0 = 0;
 unsigned long ulong1 = 0;
-#define NULL 0
 char *cP0=NULL;
 char *cP1=NULL;
 int *iP0=NULL;

From accd57460b5b7961b579368a49969f0888ccbbc1 Mon Sep 17 00:00:00 2001
From: polluks2 <74630735+polluks2@users.noreply.github.com>
Date: Fri, 19 May 2023 15:48:31 +0200
Subject: [PATCH 11/11] Reverted gconst.h

---
 include/geos/gconst.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/geos/gconst.h b/include/geos/gconst.h
index a1b6a1d86..3e42feed7 100644
--- a/include/geos/gconst.h
+++ b/include/geos/gconst.h
@@ -12,8 +12,8 @@
 #ifndef NULL
 #define NULL            ((void *) 0)
 #endif
+#define FALSE           0
 #define TRUE            0xff
-#define FALSE           ~TRUE
 #define MOUSE_SPRNUM    0
 #define DISK_DRV_LGH    0x0d80