oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge tag 'v0.19.19'

Browse Source 
release v0.19.19
This commit is contained in:
Max Kellermann
2016-08-23 10:27:39 +02:00
parent e2f6cc9c9f d4db873716
commit d0dae177cf
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Compiler.h
View File

@@ -28,12 +28,18 @@
#define GCC_VERSION 0
#endif
#ifdef __clang__
# define CLANG_VERSION GCC_MAKE_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__)
#elif defined(__GNUC__)
# define CLANG_VERSION 0
#endif
/**
* Are we building with the specified version of gcc (not clang or any
* other compiler) or newer?
*/
#define GCC_CHECK_VERSION(major, minor) \
(defined(__GNUC__) && !defined(__clang__) && \
(CLANG_VERSION == 0 && \
GCC_VERSION >= GCC_MAKE_VERSION(major, minor, 0))
/**
@@ -41,18 +47,17 @@
* gcc version?
*/
#define CLANG_OR_GCC_VERSION(major, minor) \
(defined(__clang__) || GCC_CHECK_VERSION(major, minor))
(CLANG_VERSION > 0 || GCC_CHECK_VERSION(major, minor))
/**
* Are we building with gcc (not clang or any other compiler) and a
* version older than the specified one?
*/
#define GCC_OLDER_THAN(major, minor) \
(defined(__GNUC__) && !defined(__clang__) && \
(GCC_VERSION > 0 && CLANG_VERSION == 0 && \
GCC_VERSION < GCC_MAKE_VERSION(major, minor, 0))
#ifdef __clang__
# define CLANG_VERSION GCC_MAKE_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__)
# if __clang_major__ < 3
# error Sorry, your clang version is too old. You need at least version 3.1.
# endif
@@ -68,8 +73,7 @@
* Are we building with the specified version of clang or newer?
*/
#define CLANG_CHECK_VERSION(major, minor) \
(defined(__clang__) && \
CLANG_VERSION >= GCC_MAKE_VERSION(major, minor, 0))
(CLANG_VERSION >= GCC_MAKE_VERSION(major, minor, 0))
#if CLANG_OR_GCC_VERSION(4,0)