lib: Redefine NULL only if HAVE_TYPE_CHECKS is set

diff --git a/src/lib/compat.h b/src/lib/compat.h
index afdb9c6c3b5ea94d1ebed26ed175bdf6ca371784..449664ca2c8a8de43db34d41579e183d20e1999c 100644 (file)
--- a/src/lib/compat.h
+++ b/src/lib/compat.h
@@ -17,8 +17,10 @@
 #endif
 
 /* We really want NULL to be a pointer, since we have various type-checks
-   that may result in compiler warnings/errors if it's not. */
-#ifndef __cplusplus
+   that may result in compiler warnings/errors if it's not. Do this only when
+   type checking is used - it's not otherwise needed and causes compiling
+   problems with e.g. Sun C compiler. */
+#ifdef HAVE_TYPE_CHECKS
 #  undef NULL
 #  define NULL ((void *)0)
 #endif