Mon Jan 25 12:25:38 2016 UTC ()
prop_dictionary_t hasn't been needed here in, um, 5 years, so remove
the type madness.


(pooka)
diff -r1.65 -r1.66 src/sys/rump/include/rump/rump.h

cvs diff -r1.65 -r1.66 src/sys/rump/include/rump/rump.h (expand / switch to unified diff)

--- src/sys/rump/include/rump/rump.h 2016/01/25 11:45:57 1.65
+++ src/sys/rump/include/rump/rump.h 2016/01/25 12:25:38 1.66
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: rump.h,v 1.65 2016/01/25 11:45:57 pooka Exp $ */ 1/* $NetBSD: rump.h,v 1.66 2016/01/25 12:25:38 pooka Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. 4 * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -36,37 +36,26 @@ @@ -36,37 +36,26 @@
36struct mount; 36struct mount;
37struct vnode; 37struct vnode;
38struct vattr; 38struct vattr;
39struct componentname; 39struct componentname;
40struct vfsops; 40struct vfsops;
41struct fid; 41struct fid;
42struct statvfs; 42struct statvfs;
43struct stat; 43struct stat;
44struct kauth_cred; 44struct kauth_cred;
45struct lwp; 45struct lwp;
46struct modinfo; 46struct modinfo;
47struct uio; 47struct uio;
48 48
49/* yetch */ 
50#if defined(__NetBSD__) 
51#include <prop/proplib.h> 
52#else 
53#ifndef HAVE_PROP_DICTIONARY_T 
54#define HAVE_PROP_DICTIONARY_T 
55struct prop_dictionary; 
56typedef struct prop_dictionary *prop_dictionary_t; 
57#endif 
58#endif /* __NetBSD__ */ 
59 
60#if (!defined(_KERNEL)) && (defined(__sun__) || defined(__ANDROID__)) && !defined(RUMP_REGISTER_T) 49#if (!defined(_KERNEL)) && (defined(__sun__) || defined(__ANDROID__)) && !defined(RUMP_REGISTER_T)
61#define RUMP_REGISTER_T long 50#define RUMP_REGISTER_T long
62typedef RUMP_REGISTER_T register_t; 51typedef RUMP_REGISTER_T register_t;
63#endif 52#endif
64 53
65#include <rump/rumpdefs.h> 54#include <rump/rumpdefs.h>
66 55
67/* rumpkern */ 56/* rumpkern */
68enum rump_uiorw { RUMPUIO_READ, RUMPUIO_WRITE }; 57enum rump_uiorw { RUMPUIO_READ, RUMPUIO_WRITE };
69 58
70enum rump_sigmodel { 59enum rump_sigmodel {
71 RUMP_SIGMODEL_PANIC, 60 RUMP_SIGMODEL_PANIC,
72 RUMP_SIGMODEL_IGNORE, 61 RUMP_SIGMODEL_IGNORE,