blob: 80f7aa893142093318fff680e5182d0381bb9d60 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
From c5a77c7d10bafac25deca8e3c36946df0dc43071 Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" <blueness@gentoo.org>
Date: Sat, 15 Mar 2014 08:16:41 -0400
Subject: [PATCH] Fix issue #87: fails to build on linux headers 3.13
Commit 80b10107cb added #include <linux/fcntl.h> in
src/accelerometer and friends for builds on uclibc.
This only works with glibc and musl systems with
linux headers 3.9 but fails with linux headers 3.13.
We keep <linux/fcntl.h> but drop <fcntl.h>.
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
---
src/accelerometer/accelerometer.c | 1 -
src/ata_id/ata_id.c | 1 -
src/collect/collect.c | 1 -
src/mtd_probe/mtd_probe.c | 1 -
src/scsi_id/scsi_serial.c | 1 -
5 files changed, 5 deletions(-)
diff --git a/src/accelerometer/accelerometer.c b/src/accelerometer/accelerometer.c
index f65631a..386775b 100644
--- a/src/accelerometer/accelerometer.c
+++ b/src/accelerometer/accelerometer.c
@@ -50,7 +50,6 @@
#include <math.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
#include <getopt.h>
diff --git a/src/ata_id/ata_id.c b/src/ata_id/ata_id.c
index a25c713..500669c 100644
--- a/src/ata_id/ata_id.c
+++ b/src/ata_id/ata_id.c
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <stdint.h>
#include <unistd.h>
-#include <fcntl.h>
#include <ctype.h>
#include <string.h>
#include <errno.h>
diff --git a/src/collect/collect.c b/src/collect/collect.c
index fbaf87f..7fefc62 100644
--- a/src/collect/collect.c
+++ b/src/collect/collect.c
@@ -24,7 +24,6 @@
#include <stddef.h>
#include <unistd.h>
#include <signal.h>
-#include <fcntl.h>
#include <errno.h>
#include <string.h>
#include <getopt.h>
diff --git a/src/mtd_probe/mtd_probe.c b/src/mtd_probe/mtd_probe.c
index e604a72..bab2e8e 100644
--- a/src/mtd_probe/mtd_probe.c
+++ b/src/mtd_probe/mtd_probe.c
@@ -22,7 +22,6 @@
#include <mtd/mtd-user.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
#include <linux/fcntl.h>
diff --git a/src/scsi_id/scsi_serial.c b/src/scsi_id/scsi_serial.c
index b60b154..7c5f7a3 100644
--- a/src/scsi_id/scsi_serial.c
+++ b/src/scsi_id/scsi_serial.c
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <errno.h>
#include <string.h>
-#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
#include <syslog.h>
--
1.7.9.5
|
