Refuse incompatible options in dump (-a and -B).

[dump.git] / dump / unctime.c

diff --git a/dump/unctime.c b/dump/unctime.c
index 845a333451c3e94b147da86cce719d88c8223836..d617544dad125013f2ee00552f6b29566cf48ce4 100644 (file)
--- a/dump/unctime.c
+++ b/dump/unctime.c
@@ -2,8 +2,8 @@
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@noos.fr>, 1999-2000
+ *     Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  */
 
 /*-
@@ -37,10 +37,15 @@
  * 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.
- *
- * $Id: unctime.c,v 1.5 1999/10/11 13:31:12 stelian Exp $
  */
 
+#ifndef lint
+static const char rcsid[] =
+       "$Id: unctime.c,v 1.12 2001/07/18 09:12:05 stelian Exp $";
+#endif /* not lint */
+
+#include <config.h>
+#include <sys/time.h>
 #include <time.h>
 #ifdef __STDC__
 #include <stdlib.h>
@@ -51,7 +56,11 @@
 #include <stdio.h>
 
 #ifdef __linux__
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
 #include <ext2fs/ext2fs.h>
 #include <bsdcompat.h>
 #endif