svn commit: r258485 - head/sbin/pfctl
Gleb Smirnoff
glebius at FreeBSD.org
Fri Nov 22 20:13:32 UTC 2013
Author: glebius
Date: Fri Nov 22 20:13:32 2013
New Revision: 258485
URL: http://svnweb.freebsd.org/changeset/base/258485
Log:
Remove __FreeBSD__ ifdefs.
Modified:
head/sbin/pfctl/pfctl.c
Modified: head/sbin/pfctl/pfctl.c
==============================================================================
--- head/sbin/pfctl/pfctl.c Fri Nov 22 20:11:17 2013 (r258484)
+++ head/sbin/pfctl/pfctl.c Fri Nov 22 20:13:32 2013 (r258485)
@@ -38,10 +38,7 @@ __FBSDID("$FreeBSD$");
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/stat.h>
-
-#ifdef __FreeBSD__
#include <sys/endian.h>
-#endif
#include <net/if.h>
#include <netinet/in.h>
@@ -250,10 +247,8 @@ pfctl_enable(int dev, int opts)
if (ioctl(dev, DIOCSTART)) {
if (errno == EEXIST)
errx(1, "pf already enabled");
-#ifdef __FreeBSD__
else if (errno == ESRCH)
errx(1, "pfil registeration failed");
-#endif
else
err(1, "DIOCSTART");
}
@@ -2185,7 +2180,7 @@ main(int argc, char *argv[])
/* turn off options */
opts &= ~ (PF_OPT_DISABLE | PF_OPT_ENABLE);
clearopt = showopt = debugopt = NULL;
-#if defined(__FreeBSD__) && !defined(ENABLE_ALTQ)
+#if !defined(ENABLE_ALTQ)
altqsupport = 0;
#else
altqsupport = 1;
More information about the svn-src-head
mailing list