From: Stelian Pop Date: Mon, 11 Mar 2002 10:17:42 +0000 (+0000) Subject: Don't include linux/fs.h since it will break compilation in some cases. X-Git-Tag: release_0_4b28~10 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7ad0e4095900bf99e57eedf254d7162ef5112f43;p=dump.git Don't include linux/fs.h since it will break compilation in some cases. --- diff --git a/CHANGES b/CHANGES index d073757..b98f214 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -$Id: CHANGES,v 1.166 2002/02/27 09:47:48 stelian Exp $ +$Id: CHANGES,v 1.167 2002/03/11 10:17:42 stelian Exp $ Changes between versions 0.4b27 and 0.4b28 (released ?????????????????) ======================================================================= @@ -23,6 +23,11 @@ Changes between versions 0.4b27 and 0.4b28 (released ?????????????????) the dump. Thanks to Andrew Donkin for reporting this issue. +5. Removed the inclusion of some kernel headers in the dump + source, which prevented the compile in some kernel/glibc + headers/architecture combination. Thanks to Bdale Garbee + for reporting the bug. + Changes between versions 0.4b26 and 0.4b27 (released February 15, 2002) ======================================================================= diff --git a/dump/main.c b/dump/main.c index ee67172..3d4e693 100644 --- a/dump/main.c +++ b/dump/main.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.69 2002/01/31 10:49:17 stelian Exp $"; + "$Id: main.c,v 1.70 2002/03/11 10:17:43 stelian Exp $"; #endif /* not lint */ #include @@ -61,7 +61,6 @@ static const char rcsid[] = #include #include #ifdef __linux__ -#include #ifdef HAVE_EXT2FS_EXT2_FS_H #include #else diff --git a/dump/tape.c b/dump/tape.c index 97565d1..39d8b4c 100644 --- a/dump/tape.c +++ b/dump/tape.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: tape.c,v 1.64 2002/02/27 09:47:48 stelian Exp $"; + "$Id: tape.c,v 1.65 2002/03/11 10:17:43 stelian Exp $"; #endif /* not lint */ #include @@ -71,9 +71,6 @@ int write(), read(); #include #include #ifdef __linux__ -#include -#undef atomic_read /* this get wrongly defined in kernel */ - /* headers and we don't want it */ #ifdef HAVE_EXT2FS_EXT2_FS_H #include #else