lwall@sdcrdcf.UUCP (Larry Wall) (05/23/85)
System: rn version 4.3
Patch #: 15
Priority: LOW
Subject: shouldn't have included sys/types.h twice
From: 5432dh@homxb.UUCP (David Himber)
Description:
A previous patch made ndir.c include sys/types.h. Unfortunately,
common.h already includes it, and this gives some compilers
indigestion. I guess our compiler is too forgiving.
Fix: From rn, say "| patch -d DIR", where DIR is your rn source directory.
Outside of rn, say "cd DIR; patch <thisarticle". If you don't have
the patch program, apply the following by hand, or get patch.
If patch indicates that patchlevel is the wrong version, you may need
to apply one or more previous patches, or the patch may already
have been applied. See the patchlevel file to find out what has or
has not been applied. In any event, don't continue with the patch.
Index: patchlevel
Prereq: 14
1c1
< Patch #: 14
---
> Patch #: 15
Index: ndir.c
Prereq: 4.3.1.2
*** ndir.c.old Thu May 23 11:19:59 1985
--- ndir.c Thu May 23 11:20:04 1985
***************
*** 1,4
! /* $Header: ndir.c,v 4.3.1.2 85/05/15 14:46:00 lwall Exp $
*
* $Log: ndir.c,v $
* Revision 4.3.1.2 85/05/15 14:46:00 lwall
--- 1,4 -----
! /* $Header: ndir.c,v 4.3.1.3 85/05/23 11:19:24 lwall Exp $
*
* $Log: ndir.c,v $
* Revision 4.3.1.3 85/05/23 11:19:24 lwall
***************
*** 1,6
/* $Header: ndir.c,v 4.3.1.2 85/05/15 14:46:00 lwall Exp $
*
* $Log: ndir.c,v $
* Revision 4.3.1.2 85/05/15 14:46:00 lwall
* Changed short to ino_t, which may be ushort on some systems.
*
--- 1,9 -----
/* $Header: ndir.c,v 4.3.1.3 85/05/23 11:19:24 lwall Exp $
*
* $Log: ndir.c,v $
+ * Revision 4.3.1.3 85/05/23 11:19:24 lwall
+ * Oops, shouldn't have included sys/types.h again.
+ *
* Revision 4.3.1.2 85/05/15 14:46:00 lwall
* Changed short to ino_t, which may be ushort on some systems.
*
***************
*** 18,24
#include "ndir.h"
#ifdef USENDIR
- #include <sys/types.h>
/*
* support for Berkeley directory reading routine on a V7 file system
*/
--- 21,26 -----
#include "ndir.h"
#ifdef USENDIR
/*
* support for Berkeley directory reading routine on a V7 file system
*/