aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEivind Eklund <eivind@FreeBSD.org>1997-05-07 02:27:18 +0000
committerEivind Eklund <eivind@FreeBSD.org>1997-05-07 02:27:18 +0000
commit48ea0bec18feafd62cc2f7df74234da2e504e86a (patch)
tree06c901b37e9f1535a72cd438fa75be9f98adaa7a /include
parent89ee8ac3d677a0ff0d0c85ee38f1374fa4fe7c5e (diff)
downloadsrc-48ea0bec18feafd62cc2f7df74234da2e504e86a.tar.gz
src-48ea0bec18feafd62cc2f7df74234da2e504e86a.zip
Make a lot of include-files self-contained. I excluded the patches changing
int's to gid_t and uid_t - should I commit these, too? Closes PR misc/2625. Submitted by: Julian Assange <proff@iq.org>
Notes
Notes: svn path=/head/; revision=25520
Diffstat (limited to 'include')
-rw-r--r--include/arpa/inet.h4
-rw-r--r--include/fts.h3
-rw-r--r--include/grp.h2
-rw-r--r--include/link.h5
-rw-r--r--include/login_cap.h6
-rw-r--r--include/mpool.h2
-rw-r--r--include/protocols/dumprestore.h2
-rw-r--r--include/protocols/routed.h5
-rw-r--r--include/protocols/talkd.h3
-rw-r--r--include/protocols/timed.h4
-rw-r--r--include/pthread_np.h2
-rw-r--r--include/regex.h1
-rw-r--r--include/resolv.h4
-rw-r--r--include/rpc/auth.h6
-rw-r--r--include/rpc/auth_unix.h5
-rw-r--r--include/rpc/clnt.h5
-rw-r--r--include/rpc/pmap_clnt.h5
-rw-r--r--include/rpc/pmap_prot.h4
-rw-r--r--include/rpc/pmap_rmt.h4
-rw-r--r--include/rpc/rpc_msg.h5
-rw-r--r--include/rpc/svc.h7
-rw-r--r--include/rpc/svc_auth.h6
-rw-r--r--include/rpc/xdr.h3
-rw-r--r--include/rpcsvc/yp_prot.h4
-rw-r--r--include/rpcsvc/ypclnt.h5
-rw-r--r--include/utime.h2
-rw-r--r--include/utmp.h4
27 files changed, 89 insertions, 19 deletions
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index bdab7797f6d2..4d03df200220 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -50,7 +50,7 @@
*
* @(#)inet.h 8.1 (Berkeley) 6/2/93
* From: inet.h,v 8.6 1996/08/08 06:54:29 vixie Exp
- * $Id$
+ * $Id: inet.h,v 1.7 1997/02/23 09:17:19 peter Exp $
*/
#ifndef _ARPA_INET_H_
@@ -61,7 +61,7 @@
#include <sys/types.h>
#include <sys/cdefs.h>
-struct in_addr;
+#include <netinet/in.h>
__BEGIN_DECLS
int ascii2addr __P((int, const char *, void *));
diff --git a/include/fts.h b/include/fts.h
index 4fa4a3aa0ded..b4837cf29137 100644
--- a/include/fts.h
+++ b/include/fts.h
@@ -36,6 +36,9 @@
#ifndef _FTS_H_
#define _FTS_H_
+#include <sys/types.h>
+#include <nlist.h>
+
typedef struct {
struct _ftsent *fts_cur; /* current node */
struct _ftsent *fts_child; /* linked list of children */
diff --git a/include/grp.h b/include/grp.h
index 9e5654a958d3..1c06ece6062d 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -41,6 +41,8 @@
#ifndef _GRP_H_
#define _GRP_H_
+#include <sys/types.h>
+
#ifndef _POSIX_SOURCE
#define _PATH_GROUP "/etc/group"
#endif
diff --git a/include/link.h b/include/link.h
index 74725040a50c..e6aa65ce793c 100644
--- a/include/link.h
+++ b/include/link.h
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id$
+ * $Id: link.h,v 1.11 1997/02/23 09:17:13 peter Exp $
*/
/*
@@ -41,6 +41,9 @@
#ifndef _LINK_H_
#define _LINK_H_
+#include <sys/types.h>
+#include <nlist.h>
+
/*
* A `Shared Object Descriptor' describes a shared object that is needed
* to complete the link edit process of the object containing it.
diff --git a/include/login_cap.h b/include/login_cap.h
index 134f66cb1c01..439ad83021d2 100644
--- a/include/login_cap.h
+++ b/include/login_cap.h
@@ -21,12 +21,14 @@
*
* Low-level routines relating to the user capabilities database
*
- * $Id: login_cap.h,v 1.6 1997/02/23 09:17:13 peter Exp $
+ * $Id: login_cap.h,v 1.7 1997/03/14 17:53:35 peter Exp $
*/
#ifndef _LOGIN_CAP_H_
#define _LOGIN_CAP_H_
+#include <sys/types.h>
+
#define LOGIN_DEFCLASS "default"
#define LOGIN_DEFSTYLE "passwd"
#define LOGIN_DEFSERVICE "login"
@@ -54,7 +56,9 @@
#define BI_SECURE "secure"
#define BI_SETENV "setenv"
+#ifndef AUTH_NONE /* Protect against <rpc/auth.h> */
#define AUTH_NONE 0x00
+#endif
#define AUTH_OKAY 0x01
#define AUTH_ROOTOKAY 0x02 /* root login okay */
#define AUTH_SECURE 0x04 /* secure login */
diff --git a/include/mpool.h b/include/mpool.h
index 9e3ebeb4ed7a..b678e2b42496 100644
--- a/include/mpool.h
+++ b/include/mpool.h
@@ -36,7 +36,9 @@
#ifndef _MPOOL_H_
#define _MPOOL_H_
+#include <sys/types.h>
#include <sys/queue.h>
+#include <db.h>
/*
* The memory pool scheme is a simple one. Each in-memory page is referenced
diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h
index 72eddcd0f2da..7b31c9ea8d13 100644
--- a/include/protocols/dumprestore.h
+++ b/include/protocols/dumprestore.h
@@ -41,6 +41,8 @@
#ifndef _PROTOCOLS_DUMPRESTORE_H_
#define _PROTOCOLS_DUMPRESTORE_H_
+#include <sys/types.h>
+#include <ufs/ufs/dinode.h>
/*
* TP_BSIZE is the size of file blocks on the dump tapes.
* Note that TP_BSIZE must be a multiple of DEV_BSIZE.
diff --git a/include/protocols/routed.h b/include/protocols/routed.h
index 28cf614a5dbb..e776f2157898 100644
--- a/include/protocols/routed.h
+++ b/include/protocols/routed.h
@@ -40,7 +40,10 @@
#ifdef __cplusplus
extern "C" {
#endif
-#ident "$Revision: 1.1.1.1 $"
+#ident "$Revision: 1.8 $"
+
+#include <sys/types.h>
+#include <sys/socket.h>
/*
* Routing Information Protocol
diff --git a/include/protocols/talkd.h b/include/protocols/talkd.h
index 34b5da2e567e..1d60441d0b37 100644
--- a/include/protocols/talkd.h
+++ b/include/protocols/talkd.h
@@ -36,6 +36,9 @@
#ifndef _PROTOCOLS_TALKD_H_
#define _PROTOCOLS_TALKD_H_
+#include <sys/types.h>
+#include <sys/socket.h>
+
/*
* This describes the protocol used by the talk server and clients.
*
diff --git a/include/protocols/timed.h b/include/protocols/timed.h
index 6c6a05e86bbb..c4df1b97b7aa 100644
--- a/include/protocols/timed.h
+++ b/include/protocols/timed.h
@@ -36,6 +36,10 @@
#ifndef _PROTOCOLS_TIMED_H_
#define _PROTOCOLS_TIMED_H_
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/param.h>
+
/*
* Time Synchronization Protocol
*/
diff --git a/include/pthread_np.h b/include/pthread_np.h
index e4b5be13b382..874c7fdc0856 100644
--- a/include/pthread_np.h
+++ b/include/pthread_np.h
@@ -33,6 +33,8 @@
#ifndef _PTHREAD_NP_H_
#define _PTHREAD_NP_H_
+#include <pthread.h>
+
/*
* Non-POSIX thread function prototype definitions:
*/
diff --git a/include/regex.h b/include/regex.h
index 1611d4b87921..efba01e510c0 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -41,6 +41,7 @@
#define _REGEX_H_
#include <sys/cdefs.h>
+#include <sys/types.h>
/* types */
typedef off_t regoff_t;
diff --git a/include/resolv.h b/include/resolv.h
index c6a841684029..45fcb9b778e7 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -53,7 +53,7 @@
*
* @(#)resolv.h 8.1 (Berkeley) 6/2/93
* From Id: resolv.h,v 8.17 1996/11/26 10:11:20 vixie Exp
- * $Id$
+ * $Id: resolv.h,v 1.10 1997/02/23 09:17:15 peter Exp $
*/
#ifndef _RESOLV_H_
@@ -62,6 +62,8 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/cdefs.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
#include <stdio.h>
/*
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index 63dfc2fc71cd..0abf43889602 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -28,7 +28,7 @@
*
* from: @(#)auth.h 1.17 88/02/08 SMI
* from: @(#)auth.h 2.3 88/08/07 4.0 RPCSRC
- * $Id: auth.h,v 1.8 1997/02/23 09:17:21 peter Exp $
+ * $Id: auth.h,v 1.9 1997/05/07 00:58:23 bde Exp $
*/
/*
@@ -44,6 +44,8 @@
#ifndef _RPC_AUTH_H
#define _RPC_AUTH_H
#include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
#define MAX_AUTH_BYTES 400
#define MAXNETNAMELEN 255 /* maximum length of network user's name */
@@ -174,7 +176,9 @@ extern AUTH *authdes_create __P((char *, u_int,
struct sockaddr_in *, des_block *));
__END_DECLS
+#ifndef AUTH_NONE /* Protect against <login_cap.h>
#define AUTH_NONE 0 /* no authentication */
+#endif
#define AUTH_NULL 0 /* backward compatibility */
#define AUTH_UNIX 1 /* unix style (uid, gids) */
#define AUTH_SHORT 2 /* short hand unix style */
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index 664f798dbeb6..4d71ea44be05 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -28,7 +28,7 @@
*
* from: @(#)auth_unix.h 1.8 88/02/08 SMI
* from: @(#)auth_unix.h 2.2 88/07/29 4.0 RPCSRC
- * $Id$
+ * $Id: auth_unix.h,v 1.6 1997/02/23 09:17:21 peter Exp $
*/
/*
@@ -47,6 +47,9 @@
#ifndef _RPC_AUTH_UNIX_H
#define _RPC_AUTH_UNIX_H
#include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+#include <rpc/auth.h>
/* The machine name is part of a credential; it may not exceed 255 bytes */
#define MAX_MACHINE_NAME 255
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 773aa9524968..24066f9dd7df 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -28,7 +28,7 @@
*
* from: @(#)clnt.h 1.31 88/02/08 SMI
* from: @(#)clnt.h 2.1 88/07/29 4.0 RPCSRC
- * $Id$
+ * $Id: clnt.h,v 1.7 1997/02/23 09:17:22 peter Exp $
*/
/*
@@ -40,6 +40,9 @@
#ifndef _RPC_CLNT_H_
#define _RPC_CLNT_H_
#include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+#include <rpc/auth.h>
/*
* Rpc calls return an enum clnt_stat. This should be looked at more,
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index ada124af30d1..3f5dc2d415da 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -28,7 +28,7 @@
*
* from: @(#)pmap_clnt.h 1.11 88/02/08 SMI
* from: @(#)pmap_clnt.h 2.1 88/07/29 4.0 RPCSRC
- * $Id$
+ * $Id: pmap_clnt.h,v 1.7 1997/02/23 09:17:22 peter Exp $
*/
/*
@@ -63,6 +63,9 @@
#ifndef _RPC_PMAPCLNT_H
#define _RPC_PMAPCLNT_H
#include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+#include <netinet/in.h>
__BEGIN_DECLS
extern bool_t pmap_set __P((u_long, u_long, int, int));
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index aaec5b5b1952..4c425932df8f 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -28,7 +28,7 @@
*
* from: @(#)pmap_prot.h 1.14 88/02/08 SMI
* from: @(#)pmap_prot.h 2.1 88/07/29 4.0 RPCSRC
- * $Id$
+ * $Id: pmap_prot.h,v 1.6 1997/02/23 09:17:23 peter Exp $
*/
/*
@@ -71,6 +71,8 @@
#ifndef _RPC_PMAPPROT_H
#define _RPC_PMAPPROT_H
#include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
#define PMAPPORT ((u_short)111)
#define PMAPPROG ((u_long)100000)
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index 7bb625984f4c..94472ad159e1 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -28,7 +28,7 @@
*
* from: @(#)pmap_rmt.h 1.2 88/02/08 SMI
* from: @(#)pmap_rmt.h 2.1 88/07/29 4.0 RPCSRC
- * $Id$
+ * $Id: pmap_rmt.h,v 1.6 1997/02/23 09:17:23 peter Exp $
*/
/*
@@ -41,6 +41,8 @@
#ifndef _RPC_PMAPRMT_H
#define _RPC_PMAPRMT_H
#include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
struct rmtcallargs {
u_long prog, vers, proc, arglen;
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index 654cd7d59817..bc5637d18a08 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -28,7 +28,7 @@
*
* from: @(#)rpc_msg.h 1.7 86/07/16 SMI
* from: @(#)rpc_msg.h 2.1 88/07/29 4.0 RPCSRC
- * $Id$
+ * $Id: rpc_msg.h,v 1.8 1997/02/23 09:17:24 peter Exp $
*/
/*
@@ -40,6 +40,9 @@
#ifndef _RPC_RPCMSG_H
#define _RPC_RPCMSG_H
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+#include <rpc/auth.h>
#define RPC_MSG_VERSION ((u_long) 2)
#define RPC_SERVICE_PORT ((u_short) 2048)
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index e72959f0b786..c058bad84a27 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -28,7 +28,7 @@
*
* from: @(#)svc.h 1.20 88/02/08 SMI
* from: @(#)svc.h 2.2 88/07/29 4.0 RPCSRC
- * $Id$
+ * $Id: svc.h,v 1.9 1997/02/23 09:17:24 peter Exp $
*/
/*
@@ -40,6 +40,11 @@
#ifndef _RPC_SVC_H
#define _RPC_SVC_H
#include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+#include <rpc/auth.h>
+#include <rpc/rpc_msg.h>
+#include <netinet/in.h>
/*
* This interface must manage two items concerning remote procedure calling:
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index 295027cc6394..e7b8325f0e32 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -28,7 +28,7 @@
*
* from: @(#)svc_auth.h 1.6 86/07/16 SMI
* from: @(#)svc_auth.h 2.1 88/07/29 4.0 RPCSRC
- * $Id$
+ * $Id: svc_auth.h,v 1.6 1997/02/23 09:17:25 peter Exp $
*/
/*
@@ -39,6 +39,10 @@
#ifndef _RPC_SVCAUTH_H
#define _RPC_SVCAUTH_H
+#include <sys/cdefs.h>
+#include <rpc/auth.h>
+#include <rpc/svc.h>
+#include <rpc/rpc_msg.h>
/*
* Server side authenticator
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index ae9923f9c7a0..8d82ccdbdda1 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -28,7 +28,7 @@
*
* from: @(#)xdr.h 1.19 87/04/22 SMI
* from: @(#)xdr.h 2.2 88/07/29 4.0 RPCSRC
- * $Id$
+ * $Id: xdr.h,v 1.7 1997/02/23 09:17:25 peter Exp $
*/
/*
@@ -40,6 +40,7 @@
#ifndef _RPC_XDR_H
#define _RPC_XDR_H
#include <sys/cdefs.h>
+#include <rpc/types.h>
/*
* XDR provides a conventional way for converting between C data
diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h
index d72fd0b8f517..3ef704659805 100644
--- a/include/rpcsvc/yp_prot.h
+++ b/include/rpcsvc/yp_prot.h
@@ -26,12 +26,14 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: yp_prot.h,v 1.6 1997/02/23 09:17:33 peter Exp $
*/
#ifndef _RPCSVC_YP_PROT_H_
#define _RPCSVC_YP_PROT_H_
+#include <rpc/rpc.h>
+
/*
* YPSERV PROTOCOL:
*
diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h
index 5ed87027a64f..97ca44087a37 100644
--- a/include/rpcsvc/ypclnt.h
+++ b/include/rpcsvc/ypclnt.h
@@ -26,12 +26,15 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: ypclnt.h,v 1.6 1997/02/23 09:17:34 peter Exp $
*/
#ifndef _RPCSVC_YPCLNT_H_
#define _RPCSVC_YPCLNT_H_
+#include <rpc/rpc.h>
+#include <rpcsvc/yp_prot.h>
+
#define YPERR_BADARGS 1 /* args to function are bad */
#define YPERR_RPC 2 /* RPC failure */
#define YPERR_DOMAIN 3 /* can't bind to a server for domain */
diff --git a/include/utime.h b/include/utime.h
index 1ea12d0cb16b..a1e77fcba32d 100644
--- a/include/utime.h
+++ b/include/utime.h
@@ -36,6 +36,8 @@
#ifndef _UTIME_H_
#define _UTIME_H_
+#include <sys/types.h>
+
struct utimbuf {
time_t actime; /* Access time */
time_t modtime; /* Modification time */
diff --git a/include/utmp.h b/include/utmp.h
index e4dbe2dfc401..573ed68cce06 100644
--- a/include/utmp.h
+++ b/include/utmp.h
@@ -36,12 +36,14 @@
* SUCH DAMAGE.
*
* @(#)utmp.h 8.2 (Berkeley) 1/21/94
- * $Id$
+ * $Id: utmp.h,v 1.5 1997/02/23 09:17:16 peter Exp $
*/
#ifndef _UTMP_H_
#define _UTMP_H_
+#include <sys/types.h>
+
#define _PATH_UTMP "/var/run/utmp"
#define _PATH_WTMP "/var/log/wtmp"
#define _PATH_LASTLOG "/var/log/lastlog"