On Mon, Sep 23, 2013 at 10:39:08AM -0700, Kristian Høgsberg wrote: > On Mon, Sep 23, 2013 at 07:26:03AM +0200, Pier Luigi Fiorini wrote: > > Make it easier to check for a Weston version. > > Ah yup, I lost track of that one. Thanks, committed. > > Kristian > > > --- > > src/version.h.in | 12 +++++++++++- > > 1 file changed, 11 insertions(+), 1 deletion(-) > > > > diff --git a/src/version.h.in b/src/version.h.in > > index f573328..d45172c 100644 > > --- a/src/version.h.in > > +++ b/src/version.h.in > > @@ -26,6 +26,16 @@ > > #define WESTON_VERSION_MAJOR @WESTON_VERSION_MAJOR@ > > #define WESTON_VERSION_MINOR @WESTON_VERSION_MINOR@ > > #define WESTON_VERSION_MICRO @WESTON_VERSION_MICRO@ > > -#define WESTON_VERSION "@WESTON_VERSION@" > > + > > +#define WESTON_VERSION ((WESTON_VERSION_MAJOR << 16) | > > (WESTON_VERSION_MINOR << 8) | (WESTON_VERSION_MICRO)) > > +#define WESTON_VERSION_STR "@WESTON_VERSION@" > > + > > +/* > > + Can be used like #if (WESTON_VERSION >= WESTON_VERSION_AT_LEAST(1, 2, > > 0)) > > +*/ > > +#define WESTON_VERSION_AT_LEAST(major, minor, micro) \ > > + (WESTON_VERSION_MAJOR == (major) && \ > > + WESTON_VERSION_MINOR == (minor) && \ > > + WESTON_VERSION_MICRO >= (micro))
Actually, I trimmed the patch to be just the WESTON_VERSION_AT_LEAST macro. WESTON_VERSION is still the version string and I updated the comment to say /* Can be used like #if WESTON_VERSION_AT_LEAST(1, 2, 0) */ Kristian > > > > #endif > > -- > > 1.8.3.1 > > > > _______________________________________________ > > wayland-devel mailing list > > wayland-devel@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel