diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/Makefile | 22 | ||||
| -rw-r--r-- | usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/defs.h | 14 |
2 files changed, 11 insertions, 25 deletions
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/Makefile b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/Makefile index e9b2cbd6ae..acaccc9987 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/Makefile @@ -23,7 +23,7 @@ # Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# Copyright 2018, Joyent, Inc. +# Copyright 2019 Joyent, Inc. # PROG= in.ikev2d @@ -62,22 +62,19 @@ include $(SRC)/cmd/Makefile.cmd include $(SRC)/cmd/Makefile.cmd.64 include $(SRC)/cmd/Makefile.ctf -# Lint doesn't like ## __VA_ARGS__ macros -LINTFLAGS += $(C99LMODE) -D_XOPEN_SOURCE=600 -erroff=E_ARGUMENT_MISMATCH - CSTD = $(CSTD_GNU99) CFLAGS += $(CCVERBOSE) -CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ - -# Use X/Open sockets for fromto.c so we can use control messages for -# source address selection -fromto.o := CPPFLAGS += -D_XOPEN_SOURCE=600 -# ... but as a consequence, you have to disable a few lint checks. -LINTFLAGS += -erroff=E_INSONS_ARG_DECL2 -errorr=E_INCONS_VAL_TYPE_DECL2 +# Use X/Open sockets so we can use control messages for source +# address selection +CPPFLAGS += -D_REENTRANT \ + -D_POSIX_PTHREAD_SEMANTICS \ + -D_XOPEN_SOURCE=600 \ + -D__EXTENSIONS__ \ LDLIBS += -lbunyan \ -lcmdutils \ + -lcustr \ -lcryptoutil \ -linetutil \ -lipsecutil \ @@ -105,9 +102,6 @@ all: $(PROG) clean: -$(RM) $(CLEANFILES) -# XXX: Disable lint for the moment -lint: #lint_SRCS - $(PROG): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(POST_PROCESS) diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/defs.h b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/defs.h index c8aaea9fdb..cc99537554 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/defs.h +++ b/usr/src/cmd/cmd-inet/usr.lib/in.ikev2d/defs.h @@ -194,21 +194,13 @@ extern uint32_t category; /* END CSTYLED */ -#ifdef lint /* - * Currently, we cannot have both __EXTENSIONS__ and XTI sockets enabled - * (sigh...). We need XTI sockets for fromto.c, but it also means we - * have to use _B_{TRUE,FALSE} which is confusing (as everyone expects - * B_{TRUE,FALSE}. - * - * We fix this during build by only defining XOPEN_SOURCE=600 - * when building fromto.c, however that makes our old friend lint quite irate. - * So we pull the wool over lints eyes to make it happy. We do this here - * since everything pulls this file in. + * We want XTI sockets, which requires setting _XOPEN_SOURCE, but then + * we get the annoying _B_TRUE and _B_FALSE versions of boolean_t, + * so we define the more traditional values here. */ #define B_TRUE _B_TRUE #define B_FALSE _B_FALSE -#endif typedef enum event { EVENT_NONE, |