MFC r268981 Remove #ifdef-s to reduce difference to upstream.
MFC r268981
Remove #ifdef-s to reduce difference to upstream.

Pointed by:     kib
Approved by:    re (glebius)

Sponsored by:	The FreeBSD Foundation

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase