Module Name: src
Committed By: pooka
Date: Mon Dec 13 21:07:55 UTC 2010
Modified Files:
src/lib/libc/gen: sysctlnametomib.c
src/lib/libc/net: if_indextoname.c
Log Message:
last of the RUMP_ACTION syscall swappers
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/gen/sysctlnametomib.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/net/if_indextoname.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/sysctlnametomib.c
diff -u src/lib/libc/gen/sysctlnametomib.c:1.4 src/lib/libc/gen/sysctlnametomib.c:1.5
--- src/lib/libc/gen/sysctlnametomib.c:1.4 Tue Apr 29 06:53:01 2008
+++ src/lib/libc/gen/sysctlnametomib.c Mon Dec 13 21:07:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctlnametomib.c,v 1.4 2008/04/29 06:53:01 martin Exp $ */
+/* $NetBSD: sysctlnametomib.c,v 1.5 2010/12/13 21:07:55 pooka Exp $ */
/*-
* Copyright (c) 2003,2004 The NetBSD Foundation, Inc.
@@ -31,10 +31,12 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sysctlnametomib.c,v 1.4 2008/04/29 06:53:01 martin Exp $");
+__RCSID("$NetBSD: sysctlnametomib.c,v 1.5 2010/12/13 21:07:55 pooka Exp $");
#endif /* LIBC_SCCS and not lint */
+#ifndef RUMP_ACTION
#include "namespace.h"
+#endif
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -42,6 +44,11 @@
__weak_alias(sysctlnametomib,_sysctlnametomib)
#endif
+#ifdef RUMP_ACTION
+#include <rump/rump_syscalls.h>
+#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
+#endif /* RUMP_ACTION */
+
/*
* freebsd compatible sysctlnametomib() function, implemented as an
* extremely thin wrapper around sysctlgetmibinfo(). i think the use
Index: src/lib/libc/net/if_indextoname.c
diff -u src/lib/libc/net/if_indextoname.c:1.5 src/lib/libc/net/if_indextoname.c:1.6
--- src/lib/libc/net/if_indextoname.c:1.5 Sat Nov 25 23:09:11 2006
+++ src/lib/libc/net/if_indextoname.c Mon Dec 13 21:07:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_indextoname.c,v 1.5 2006/11/25 23:09:11 elad Exp $ */
+/* $NetBSD: if_indextoname.c,v 1.6 2010/12/13 21:07:54 pooka Exp $ */
/* $KAME: if_indextoname.c,v 1.7 2000/11/08 03:09:30 itojun Exp $ */
/*-
@@ -28,10 +28,12 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: if_indextoname.c,v 1.5 2006/11/25 23:09:11 elad Exp $");
+__RCSID("$NetBSD: if_indextoname.c,v 1.6 2010/12/13 21:07:54 pooka Exp $");
#endif /* LIBC_SCCS and not lint */
+#ifndef RUMP_ACTION
#include "namespace.h"
+#endif
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if_dl.h>
