config-def.h is now unnecessary; merge config-data.h into defs.h

3 files changed, 7 insertions, 121 deletions

diff --git a/usr.bin/rdist/config-data.h b/usr.bin/rdist/config-data.h
deleted file mode 100644
index 14fa536a619..00000000000
--- a/usr.bin/rdist/config-data.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$OpenBSD: config-data.h,v 1.10 2014/07/10 14:29:03 guenther Exp $	*/
-
-/*
- * Copyright (c) 1993 Michael A. Cooper
- * Copyright (c) 1993 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * $From: config-data.h,v 1.1.1.2 1996/02/15 21:52:02 christos Exp $
- * @(#)configdata.h
- */
-
-#ifndef __configdata_h__
-#define __configdata_h__
-
-/*
- * Configuration data
- */
-
-/*
- * Define the read and write values for the file descriptor array
- * used by pipe().
- */
-#define PIPE_READ		0
-#define PIPE_WRITE		1
-
-#endif	/* __configdata_h__ */
diff --git a/usr.bin/rdist/config-def.h b/usr.bin/rdist/config-def.h
deleted file mode 100644
index 7a689328a35..00000000000
--- a/usr.bin/rdist/config-def.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$OpenBSD: config-def.h,v 1.10 2014/07/05 06:45:00 guenther Exp $	*/
-
-/*
- * Copyright (c) 1993 Michael A. Cooper
- * Copyright (c) 1993 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * $From: config-def.h,v 1.1.1.1 1995/05/20 23:35:17 christos Exp $
- * @(#)configdef.h
- */
-
-#ifndef __configdef_h__
-#define __configdef_h__
-
-/*
- * Configuration definetions
- */
-
-/*
- * Types of filesystem info routines
- */
-#define FSI_GETFSSTAT		1
-#define FSI_GETMNT		2
-#define FSI_MNTCTL		3
-#define FSI_GETMNTENT		4
-
-/*
- * Types of set filetime functions
- */
-#define SETFTIME_UTIMES		1		/* Have utimes() */
-#define SETFTIME_UTIME		2		/* Have utime() */
-
-/*
- * Types of statfs() calls
- */
-#define STATFS_BSD		1
-#define STATFS_SYSV		2
-#define STATFS_OSF1		3
-
-#endif	/* __configdef_h__ */
diff --git a/usr.bin/rdist/defs.h b/usr.bin/rdist/defs.h
index 4bcbcce1ac0..381579a96d0 100644
--- a/usr.bin/rdist/defs.h
+++ b/usr.bin/rdist/defs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: defs.h,v 1.28 2014/07/12 03:32:00 guenther Exp $	*/
+/*	$OpenBSD: defs.h,v 1.29 2014/07/12 03:40:16 guenther Exp $	*/
 
 #ifndef __DEFS_H__
 #define __DEFS_H__
@@ -63,13 +63,17 @@
 #endif
 
 #include "version.h"
-#include "config-def.h"
 #include "config.h"
-#include "config-data.h"
 #include "pathnames.h"
 #include "types.h"
 #include "filesys.h"
 
+/*
+ * Define the read and write values for the file descriptor array
+ * used by pipe().
+ */
+#define PIPE_READ		0
+#define PIPE_WRITE		1
 
 /*
  * This belongs in os-svr4.h but many SVR4 OS's