[src/pgoyette-compat]: src/sys/compat/common Remove unnecessary conditionals....

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ea771620259d
branches:  pgoyette-compat
changeset: 320978:ea771620259d
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Thu Mar 08 09:56:05 2018 +0000

description:
Remove unnecessary conditionals.  These files aren't built unless
their content is needed (via config option or module configuration).

diffstat:

 sys/compat/common/uipc_syscalls_40.c |  9 +++------
 sys/compat/common/uipc_syscalls_50.c |  6 ++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diffs (69 lines):

diff -r 7aebef34ff26 -r ea771620259d sys/compat/common/uipc_syscalls_40.c
--- a/sys/compat/common/uipc_syscalls_40.c      Thu Mar 08 09:54:36 2018 +0000
+++ b/sys/compat/common/uipc_syscalls_40.c      Thu Mar 08 09:56:05 2018 +0000
@@ -1,9 +1,9 @@
-/*     $NetBSD: uipc_syscalls_40.c,v 1.15.2.4 2018/03/08 00:25:30 pgoyette Exp $       */
+/*     $NetBSD: uipc_syscalls_40.c,v 1.15.2.5 2018/03/08 09:56:05 pgoyette Exp $       */
 
 /* written by Pavel Cahyna, 2006. Public domain. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.15.2.4 2018/03/08 00:25:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.15.2.5 2018/03/08 09:56:05 pgoyette Exp $");
 
 /*
  * System call interface to the socket abstraction.
@@ -24,7 +24,6 @@
 
 #include <compat/common/if_40.h>
 
-#ifdef COMPAT_OIFREQ
 /*
  * Return interface configuration
  * of system.  List may be used
@@ -153,8 +152,7 @@
        curlwp_bindx(bound);
        return error;
 }
-#endif
-#if defined(COMPAT_40)
+
 static int (*orig_compat_ifconf)(u_long, void *);
 static int (*orig_compat_ifconf)(u_long, void *);
  
@@ -172,4 +170,3 @@
  
        vec_compat_ifconf = orig_compat_ifconf;
 }
-#endif /* defined(COMPAT_40) */
diff -r 7aebef34ff26 -r ea771620259d sys/compat/common/uipc_syscalls_50.c
--- a/sys/compat/common/uipc_syscalls_50.c      Thu Mar 08 09:54:36 2018 +0000
+++ b/sys/compat/common/uipc_syscalls_50.c      Thu Mar 08 09:56:05 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_syscalls_50.c,v 1.3.56.2 2018/03/08 07:04:01 pgoyette Exp $       */
+/*     $NetBSD: uipc_syscalls_50.c,v 1.3.56.3 2018/03/08 09:56:05 pgoyette Exp $       */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_50.c,v 1.3.56.2 2018/03/08 07:04:01 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_50.c,v 1.3.56.3 2018/03/08 09:56:05 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -56,7 +56,6 @@
 #include <compat/sys/sockio.h>
 #include <compat/sys/if.h>
 
-#ifdef COMPAT_OIFDATA
 /*ARGSUSED*/
 int
 compat_ifdatareq(struct lwp *l, u_long cmd, void *data)
@@ -115,4 +114,3 @@
 
        vec_compat_ifdatareq = orig_compat_ifdatareq;
 }
-#endif