remove #ifndef #define blocks trying to handle lack of BUFSIZ

ok millert

diff --git a/bin/csh/csh.h b/bin/csh/csh.h
index ed4d0ef..e0b85d3 100644 (file)
--- a/bin/csh/csh.h
+++ b/bin/csh/csh.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: csh.h,v 1.19 2014/10/17 06:17:37 deraadt Exp $        */
+/*     $OpenBSD: csh.h,v 1.20 2015/01/19 18:20:47 deraadt Exp $        */
 /*     $NetBSD: csh.h,v 1.9 1995/03/21 09:02:40 cgd Exp $      */
 
 /*-
@@ -38,9 +38,6 @@
  *     BUFSIZ          The i/o buffering size; also limits word size
  *     MAILINTVL       How often to mailcheck; more often is more expensive
  */
-#ifndef BUFSIZ
-#define        BUFSIZ  1024            /* default buffer size */
-#endif                         /* BUFSIZ */
 
 #define FORKSLEEP      10      /* delay loop on non-interactive fork failure */
 #define        MAILINTVL       600     /* 10 minutes */

diff --git a/sbin/fsck_ext2fs/fsck.h b/sbin/fsck_ext2fs/fsck.h
index 3cb1eeb..ecb4050 100644 (file)
--- a/sbin/fsck_ext2fs/fsck.h
+++ b/sbin/fsck_ext2fs/fsck.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: fsck.h,v 1.11 2014/05/22 14:04:41 krw Exp $   */
+/*     $OpenBSD: fsck.h,v 1.12 2015/01/19 18:20:47 deraadt Exp $       */
 /*     $NetBSD: fsck.h,v 1.1 1997/06/11 11:21:47 bouyer Exp $  */
 
 /*
@@ -38,10 +38,6 @@
 #define        MAXBUFSPACE     80*1024 /* maximum space to allocate to buffers */
 #define        INOBUFSIZE      128*1024        /* size of buffer to read inodes in pass1 */
 
-#ifndef BUFSIZ
-#define BUFSIZ 1024
-#endif
-
 #define        USTATE  01              /* inode not allocated */
 #define        FSTATE  02              /* inode is file */
 #define        DSTATE  03              /* inode is directory */

diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index 7491474..8c90602 100644 (file)
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: fsck.h,v 1.30 2014/09/06 04:05:40 guenther Exp $      */
+/*     $OpenBSD: fsck.h,v 1.31 2015/01/19 18:20:47 deraadt Exp $       */
 /*     $NetBSD: fsck.h,v 1.13 1996/10/11 20:15:46 thorpej Exp $        */
 
 /*
@@ -62,10 +62,6 @@ union dinode {
                (dp)->dp2.field = (val);        \
        } while (0)
 
-#ifndef BUFSIZ
-#define BUFSIZ 1024
-#endif
-
 /*
  * Each inode on the file system is described by the following structure.
  * The linkcnt is initially set to the value in the inode. Each time it

diff --git a/usr.sbin/rtadvd/advcap.c b/usr.sbin/rtadvd/advcap.c
index 47368e5..7f7230e 100644 (file)
--- a/usr.sbin/rtadvd/advcap.c
+++ b/usr.sbin/rtadvd/advcap.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: advcap.c,v 1.14 2013/11/22 15:15:17 deraadt Exp $     */
+/*     $OpenBSD: advcap.c,v 1.15 2015/01/19 18:20:47 deraadt Exp $     */
 /*     $KAME: advcap.c,v 1.9 2002/05/29 14:28:35 itojun Exp $  */
 
 /*
@@ -47,9 +47,6 @@
 #include "pathnames.h"
 #include "log.h"
 
-#ifndef BUFSIZ
-#define        BUFSIZ          1024
-#endif
 #define MAXHOP         32              /* max number of tc= indirections */
 
 #define        tgetent         agetent