Merge branch 'gcc' of https://github.com/sitsofe/fio

* 'gcc' of https://github.com/sitsofe/fio:
  compiler: set minimum compiler version to GCC 4.1.0

diff --git a/compiler/compiler-gcc3.h b/compiler/compiler-gcc3.h
deleted file mode 100644 (file)
index 566987a..0000000
--- a/compiler/compiler-gcc3.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef FIO_COMPILER_GCC3_H
-#define FIO_COMPILER_GCC3_H
-
-#if __GNUC_MINOR__ >= 4
-#ifndef __must_check
-#define __must_check           __attribute__((warn_unused_result))
-#endif
-#endif
-
-#endif

diff --git a/compiler/compiler.h b/compiler/compiler.h
index 4d92ac4949c4a5111df6ae5ba0fd36325281be49..dacb737910c0f890de63bb5b4b3030d6fa1311fc 100644 (file)
--- a/compiler/compiler.h
+++ b/compiler/compiler.h
@@ -2,12 +2,10 @@
 #define FIO_COMPILER_H
 
 /* IWYU pragma: begin_exports */
-#if __GNUC__ >= 4
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
 #include "compiler-gcc4.h"
-#elif __GNUC__ == 3
-#include "compiler-gcc3.h"
 #else
-#error Compiler too old, need gcc at least gcc 3.x
+#error Compiler too old, need at least gcc 4.1.0
 #endif
 /* IWYU pragma: end_exports */