diff options
| author | mrsanchos <orokhovatskiy@gmail.com> | 2018-02-16 21:05:36 +0300 |
|---|---|---|
| committer | mrsanchos <orokhovatskiy@gmail.com> | 2018-02-16 21:05:36 +0300 |
| commit | b52fd95f1cc86e86ecb696eab07c8d6b6a2e9f5d (patch) | |
| tree | a8d5a8c98d8ca3b60b0805504049275a3311f59b /compat/macros.hpp | |
| parent | 82c43da829fdac974b3d6adb8742715382ddd051 (diff) | |
| parent | 7a973ae2ad396c8413405e40bcb2eaab67c95d15 (diff) | |
Merge branch 'unstable' of https://github.com/opentrack/opentrack into unstable
Diffstat (limited to 'compat/macros.hpp')
| -rw-r--r-- | compat/macros.hpp | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/compat/macros.hpp b/compat/macros.hpp index 7c017d3e..df71b1f3 100644 --- a/compat/macros.hpp +++ b/compat/macros.hpp @@ -21,28 +21,14 @@ # define never_inline #endif -#if defined __GNUG__ +#if defined __cplusplus # define restrict_ptr __restrict -#elif defined _MSC_VER -# define restrict_ptr __restrict -#else -# define restrict_ptr -#endif - -#if defined _MSC_VER -# define restrict_ref restrict_ptr -#elif defined __GNUG__ -# define restrict_ref restrict_ptr -#else -# define restrict_ref #endif #if defined _MSC_VER # define force_inline __forceinline -#elif defined __GNUG__ -# define force_inline __attribute__((always_inline, gnu_inline)) inline #else -# define force_inline inline +# define force_inline __attribute__((always_inline, gnu_inline)) inline #endif #ifdef Q_CREATOR_RUN @@ -53,18 +39,6 @@ # define warn_result_unused __attribute__((warn_unused_result)) #endif -#if defined __GNUG__ -# define unused(t, i) t __attribute__((unused)) i -#else -# define unused(t, i) t -#endif - -#if defined _MSC_VER -# define aligned_struct(x) struct __declspec(align(x)) -#else -# define aligned_struct(x) struct __attribute__((__aligned__(x))) -#endif - #if defined __GNUC__ # define likely(x) __builtin_expect(!!(x),1) # define unlikely(x) __builtin_expect(!!(x),0) |