Merge commit 'fml/master'

Conflicts:
	adu.ggo
	user.c

diff --git a/gcc-compat.h b/gcc-compat.h
index 4ba96ae16da204b760219bded23e55c38053976c..1964e78bfd527d7c9ade762c7473ecc60ba72e93 100644 (file)
--- 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 913d3f06308fed446b72ce67510c2288eab13e53..1c7562271a0948941c8b5e5ba41f8826dec1d7e9 100644 (file)
--- 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 2ed3d471bf9227424993383ac4e314aeedbf5b48..0ae4a6c9af04fe3eab521f38f9c14b74e4f69a8c 100644 (file)
--- 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"