From: Andre Noll <maan@systemlinux.org>
Date: Tue, 10 Feb 2009 22:08:20 +0000 (+0100)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.1.0~16
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=d0f564069d8445e5ffe03c57ff63721f4c47877e;hp=296cf54c41e837568ac77570d58a133c41db0b63;p=adu.git

Merge commit 'fml/master'

Conflicts:
	adu.ggo
	user.c
---

diff --git a/gcc-compat.h b/gcc-compat.h
index 4ba96ae..1964e78 100644
--- a/gcc-compat.h
+++ b/gcc-compat.h
@@ -72,7 +72,13 @@
  */
 #define _static_inline_ static inline
 
+/**
+ * On systems whihout large file support (BSD) there is no * struct stat64 and
+ * no lstat64().
+ */
 #ifndef HAVE_STAT64
-#define stat64 stat
-#define lstat64 lstat
+	/** Use the usual stat structure. */
+	#define stat64 stat
+	/** Use the usual lstat() function. */
+	#define lstat64 lstat
 #endif
diff --git a/interactive.c b/interactive.c
index 913d3f0..1c75622 100644
--- a/interactive.c
+++ b/interactive.c
@@ -12,6 +12,7 @@
 #include "format.h"
 #include "user.h"
 #include "string.h"
+#include "cmdline.h"
 #include "select.cmdline.h"
 #include "select.h"
 #include "error.h"
diff --git a/user.c b/user.c
index 2ed3d47..0ae4a6c 100644
--- a/user.c
+++ b/user.c
@@ -10,7 +10,6 @@
 #include <dirent.h> /* readdir() */
 #include <sys/types.h>
 #include <pwd.h>
-#include "cmdline.h" /* TODO: This file should be independent of command line options */
 #include "user.h"
 #include "fd.h"
 #include "string.h"