projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge os-android.h into os-linux.h
[fio.git]
/
os
/
os.h
diff --git
a/os/os.h
b/os/os.h
index 810e61668572171a5b201d110238781ac8f939b3..aba6813f23e943bc0843ce3947b29548c34d897e 100644
(file)
--- a/
os/os.h
+++ b/
os/os.h
@@
-33,9
+33,7
@@
typedef enum {
} cpu_features;
/* IWYU pragma: begin_exports */
-#if defined(__ANDROID__)
-#include "os-android.h"
-#elif defined(__linux__)
+#if defined(__linux__)
#include "os-linux.h"
#elif defined(__FreeBSD__)
#include "os-freebsd.h"