diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2014-03-22 18:07:36 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-03-22 18:07:36 -0400 |
| commit | 974354dee5f5abdea22958c3d57f41d9425f1a8c (patch) | |
| tree | dd41833061190721b495b575d108b1bd3a2b552e /src/scsi_id/scsi_serial.c | |
| parent | ac73951d246e035b92771bdddc2892bdabeed760 (diff) | |
Revisit issue #87: fails to build on linux headers 3.13
Dropping <fcntl.h> in favor of <linux/fcntl.h> is incorrect. Yet
uClibc needs O_CLOEXEC from <linux/fcntl.h>. So we re-introduce
<fcntl.h> and include <linux/fcntl.h> only on uClibc systems to
avoid redefinitions.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/scsi_id/scsi_serial.c')
| -rw-r--r-- | src/scsi_id/scsi_serial.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/scsi_id/scsi_serial.c b/src/scsi_id/scsi_serial.c index 7c5f7a35ef..b9a94e66e6 100644 --- a/src/scsi_id/scsi_serial.c +++ b/src/scsi_id/scsi_serial.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <errno.h> #include <string.h> +#include <fcntl.h> #include <stdlib.h> #include <unistd.h> #include <syslog.h> @@ -32,7 +33,10 @@ #include <scsi/sg.h> #include <linux/types.h> #include <linux/bsg.h> + +#ifdef __UCLIBC__ #include <linux/fcntl.h> +#endif #include "libudev.h" #include "libudev-private.h" |