Only use clang's Nullability feature with enabled manywarnings

ad037396 · Tim Rühsen · d543db81 · ad037396 · ad037396 · ad037396
Commit ad037396 authored Aug 30, 2019 by Tim Rühsen 🛠
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

configure.ac configure.ac +1 -0

include/wget/wget.h include/wget/wget.h +1 -1

libwget/Makefile.am libwget/Makefile.am +1 -1

No files found.
--- a/configure.ac
+++ b/configure.ac
@@ -208,6 +208,7 @@ if test -n "$WARN_CFLAGS"; then
    # wget_WORD_REMOVE([GNULIB_WARN_CFLAGS], [$GNULIB_WARN_CFLAGS], [$CFLAGS])
  fi

+  AC_SUBST([MANYWARNINGS], [-DWGET_MANYWARNINGS])
  AC_SUBST([WARN_CFLAGS])
  AC_SUBST([GNULIB_WARN_CFLAGS])
 fi

--- a/include/wget/wget.h
+++ b/include/wget/wget.h
@@ -191,7 +191,7 @@
 #  define NULLABLE
 #else
 #  define RETURNS_NONNULL
-#  if defined __clang_major__
+#  if defined __clang_major__ && defined WGET_MANYWARNINGS
 #    define NULLABLE _Nullable
 #  else
 #    define NULLABLE

--- a/libwget/Makefile.am
+++ b/libwget/Makefile.am
-AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) $(CODE_COVERAGE_CFLAGS) -DBUILDING_LIBWGET
+AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) $(CODE_COVERAGE_CFLAGS) $(MANYWARNINGS) -DBUILDING_LIBWGET

 lib_LTLIBRARIES = libwget.la