CVS commit: [pgoyette-compat] src/sys/compat/common

[Paul Goyette]

Module Name:    src
Committed By:   pgoyette
Date:           Thu Mar  8 09:56:06 UTC 2018

Modified Files:
        src/sys/compat/common [pgoyette-compat]: uipc_syscalls_40.c
            uipc_syscalls_50.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.15.2.4 -r1.15.2.5 src/sys/compat/common/uipc_syscalls_40.c
cvs rdiff -u -r1.3.56.2 -r1.3.56.3 src/sys/compat/common/uipc_syscalls_50.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/compat/common/uipc_syscalls_40.c
diff -u src/sys/compat/common/uipc_syscalls_40.c:1.15.2.4 src/sys/compat/common/uipc_syscalls_40.c:1.15.2.5
--- src/sys/compat/common/uipc_syscalls_40.c:1.15.2.4	Thu Mar  8 00:25:30 2018
+++ src/sys/compat/common/uipc_syscalls_40.c	Thu Mar  8 09:56:05 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_syscall
 
 #include <compat/common/if_40.h>
 
-#ifdef COMPAT_OIFREQ
 /*
  * Return interface configuration
  * of system.  List may be used
@@ -153,8 +152,7 @@ release_exit:
 	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 @@ if_40_fini(void)
  
 	vec_compat_ifconf = orig_compat_ifconf;
 }
-#endif /* defined(COMPAT_40) */

Index: src/sys/compat/common/uipc_syscalls_50.c
diff -u src/sys/compat/common/uipc_syscalls_50.c:1.3.56.2 src/sys/compat/common/uipc_syscalls_50.c:1.3.56.3
--- src/sys/compat/common/uipc_syscalls_50.c:1.3.56.2	Thu Mar  8 07:04:01 2018
+++ src/sys/compat/common/uipc_syscalls_50.c	Thu Mar  8 09:56:05 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_syscall
 #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 @@ if_50_fini(void)
 
 	vec_compat_ifdatareq = orig_compat_ifdatareq;
 }
-#endif