gistfile.patch

commit b77ca4a87b6bc950be82f8163472ffbd674b524a
Author: Toomas Soome <[email protected]>
Date:   Sun Mar 11 12:57:44 2018 -0700

    9181 ipf: this use of "defined" may not be portable
    Reviewed by: Yuri Pankov <[email protected]>
    Reviewed by: Andrew Stormont <[email protected]>
    Reviewed by: Alexander Pyhalov <[email protected]>
    Approved by: Joshua M. Clulow <[email protected]>

diff --git a/usr/src/uts/sparc/ipf/Makefile b/usr/src/uts/sparc/ipf/Makefile
index 5ed794ece5..b3755c1283 100644
--- a/usr/src/uts/sparc/ipf/Makefile
+++ b/usr/src/uts/sparc/ipf/Makefile
@@ -25,7 +25,7 @@
 # uts/sparc/ipf/Makefile
 #
 #
-#	This makefile drives the production of the ipf driver 
+#	This makefile drives the production of the ipf driver
 #	kernel module.
 #
 #	sparc architecture dependent
@@ -61,8 +61,8 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 # lint pass one enforcement and OS version
 #
 CFLAGS += $(CCVERBOSE)
-CPPFLAGS += -DIPFILTER_LKM -DIPFILTER_LOG -DIPFILTER_LOOKUP 
-CPPFLAGS += -DSUNDDI -DSOLARIS2=$(RELEASE_MINOR) -DIRE_ILL_CN -DUSE_INET6
+CPPFLAGS += -DIPFILTER_LKM -DIPFILTER_LOG -DIPFILTER_LOOKUP -DUSE_INET6
+CPPFLAGS += -DSUNDDI -DSOLARIS=1 -DSOLARIS2=$(RELEASE_MINOR) -DIRE_ILL_CN
 LDFLAGS += -dy -Ndrv/ip -Nmisc/md5 -Nmisc/neti -Nmisc/hook -Nmisc/kcf
 
 INC_PATH += -I$(UTSBASE)/common/inet/ipf
@@ -72,10 +72,10 @@ INC_PATH += -I$(UTSBASE)/common/inet/ipf
 # to investigate and remove these for maximum lint coverage.
 # Please do not carry these forward to new Makefiles.
 #
+LINTTAGS	+= -erroff=E_STATIC_UNUSED
 LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
 LINTTAGS	+= -erroff=E_PTRDIFF_OVERFLOW
 LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-LINTTAGS	+= -erroff=E_STATIC_UNUSED
 
 CERRWARN	+= -_gcc=-Wno-unused-function
 CERRWARN	+= -_gcc=-Wno-unused-variable
@@ -98,7 +98,7 @@ clobber:	$(CLOBBER_DEPS) $(SISCLEAN_DEPS)
 
 lint:		$(LINT_DEPS)
 
-modlintlib:	$(MODLINTLIB_DEPS) 
+modlintlib:	$(MODLINTLIB_DEPS)
 
 clean.lint:	$(CLEAN_LINT_DEPS)