Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Tue, 10 Feb 2009 22:08:20 +0000 (23:08 +0100)
committerAndre Noll <maan@systemlinux.org>
Tue, 10 Feb 2009 22:08:20 +0000 (23:08 +0100)
Conflicts:
adu.ggo
user.c

gcc-compat.h
interactive.c
user.c

index 4ba96ae..1964e78 100644 (file)
  */
 #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
index 913d3f0..1c75622 100644 (file)
@@ -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 (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"