diff options
| author | Eric Andersen <andersen@codepoet.org> | 2000-07-09 03:53:36 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2000-07-09 03:53:36 +0000 |
| commit | f8fcb08913209770f0c5e2fe7c7ee1897369d2c9 (patch) | |
| tree | 52ee664f22e211c01c5f1f4d03b12a8588a257bf /include/sys | |
| parent | 31819c989bd068d688f2335032c517529087383e (diff) | |
Fixed dir/dirent
-Erik
Diffstat (limited to 'include/sys')
| -rw-r--r-- | include/sys/dir.h | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/include/sys/dir.h b/include/sys/dir.h index 1c2cea7df..96b36c78d 100644 --- a/include/sys/dir.h +++ b/include/sys/dir.h @@ -1,17 +1,28 @@ -#ifdef _SYS_DIRENT_H -#error "Can't include both sys/dir.h and sys/dirent.h" -#define _SYS_DIR_H -#endif +/* Copyright (C) 1991, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. -#ifndef _SYS_DIR_H -#define _SYS_DIR_H + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -#include <dirent.h> + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _SYS_DIR_H +#define _SYS_DIR_H 1 -#define direct dirent +#include <features.h> + +#include <dirent.h> -#undef DIRSIZ -#define DIRSIZ(dp) ((sizeof (struct direct) - (MAXNAMLEN+1)) + \ - (((dp)->d_namlen+1 + 3) &~ 3)) +#define direct dirent -#endif +#endif /* sys/dir.h */ |