From 20406de6b8b656e98262d37cc3f61d196dad1a82 Mon Sep 17 00:00:00 2001
From: Thomas Zander <thomas.e.zander@googlemail.com>
Date: Thu, 10 Apr 2025 07:21:52 +0200
Subject: [PATCH 1/1] Fix NULL for C++ compilers
This pulls in the NULL definition from stddef.h instead of providing a
definition itself. This fixes compilation with newer C++ compilers which
no longer accept (void*)0.
Fixes: #24
---
include/cdio/types.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/include/cdio/types.h b/include/cdio/types.h
index ad3e09a4..40f07229 100644
--- a/include/cdio/types.h
+++ b/include/cdio/types.h
@@ -31,6 +31,8 @@ extern "C" {
# include <stdbool.h>
#endif /* __cplusplus */
+#include <stddef.h>
+
/* If <sys/types.h> is not available on your platform please
contact the libcdio mailing list so that we can fix it! */
#if !defined(ARE_THERE_STILL_ENVS_WITHOUT_SYS_TYPES)
@@ -162,10 +164,6 @@ typedef uint8_t ubyte;
#else
# define GNUC_LIKELY(x) (x)
# define GNUC_UNLIKELY(x) (x)
-#endif
-
-#ifndef NULL
-# define NULL ((void*) 0)
#endif
/** Provide a notice for deprecated elements. Before gcc 4.5 'deprecated'
--
2.50.0