Define ipfilter's SOLARIS macro in a more portable way
ClosedPublic
Actions

Authored by dim on Aug 27 2016, 10:17 PM.

Details

Reviewers

cy
glebius

Commits

rS304953: Define ipfilter's SOLARIS macro in a defined and portable way.

Summary

From clang 3.9.0 I'm getting this warning about ipfilter's SOLARIS
macro:

In file included from ioctl.c:82:
/usr/obj/usr/src/tmp/usr/include/netinet/ip_fil.h:1080:6: error: macro expansion producing 'defined' has undefined behavior [-Werror,-Wexpansion-to-defined]
# if    SOLARIS
        ^
/usr/obj/usr/src/tmp/usr/include/netinet/ip_compat.h:35:18: note: expanded from macro 'SOLARIS'
#define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
                 ^

This can easily be done in a defined and portable way.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

dim updated this revision to Diff 19753.Aug 27 2016, 10:17 PM

dim retitled this revision from to Define ipfilter's SOLARIS macro in a more portable way.

dim updated this object.

dim edited the test plan for this revision. (Show Details)

dim added reviewers: cy, glebius.

dim added a subscriber: emaste.

Herald added a subscriber: imp. · View Herald TranscriptAug 27 2016, 10:17 PM

Looks good.

Ultimately as I go through the code, all non-FreeBSD code will be removed. This works for now. Thanks.

This revision is now accepted and ready to land.Aug 27 2016, 11:57 PM

Closed by commit rS304953: Define ipfilter's SOLARIS macro in a defined and portable way. (authored by dim). · Explain WhyAug 28 2016, 11:52 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

head/

sys/

contrib/

ipfilter/

netinet/

ip_compat.h

6 lines

Diff 19755

View Options

head/sys/contrib/ipfilter/netinet/ip_compat.h

Define ipfilter's SOLARIS macro in a more portable wayClosedPublicActions