diff options
author | Kamil Dudka <kdudka@redhat.com> | 2010-01-09 21:18:06 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2010-01-12 06:31:20 +0100 |
commit | 6454dd0f2f792850453379ba081ca74eed15c2d9 (patch) | |
tree | 2ae40582021bd9c37f6060acb91bfc518a43f250 /src/ls.c | |
parent | d0f18197fcd9803bc73c3c2bb37c70ef5c3f45dc (diff) | |
download | coreutils-6454dd0f2f792850453379ba081ca74eed15c2d9.tar.xz |
ls: reorder includes to work around broken <sys/capability.h>
* src/ls.c: Include <sys/capability.h> later, to avoid build
failure with a header from libcap-2.16-1 or earlier.
See http://bugzilla.redhat.com/483548 for details.
Diffstat (limited to 'src/ls.c')
-rw-r--r-- | src/ls.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -39,10 +39,6 @@ #include <config.h> #include <sys/types.h> -#ifdef HAVE_CAP -# include <sys/capability.h> -#endif - #if HAVE_TERMIOS_H # include <termios.h> #endif @@ -113,6 +109,13 @@ #include "areadlink.h" #include "mbsalign.h" +/* Include <sys/capability.h> last to avoid a clash of <sys/types.h> + include guards with some premature versions of libcap. + For more details, see <http://bugzilla.redhat.com/483548>. */ +#ifdef HAVE_CAP +# include <sys/capability.h> +#endif + #define PROGRAM_NAME (ls_mode == LS_LS ? "ls" \ : (ls_mode == LS_MULTI_COL \ ? "dir" : "vdir")) |