diff options
Diffstat (limited to 'obt')
| -rw-r--r-- | obt/display.c | 2 | ||||
| -rw-r--r-- | obt/parse.h | 2 | ||||
| -rw-r--r-- | obt/version.h.in | 15 |
3 files changed, 16 insertions, 3 deletions
diff --git a/obt/display.c b/obt/display.c index 31d690db..d72f8ad6 100644 --- a/obt/display.c +++ b/obt/display.c @@ -135,7 +135,7 @@ static gint xerror_handler(Display *d, XErrorEvent *e) else g_error("X Error: %s", errtxt); } else - g_message("XError code %d '%s'", e->error_code, errtxt); + g_message("Ignoring XError code %d '%s'", e->error_code, errtxt); #else (void)d; (void)e; #endif diff --git a/obt/parse.h b/obt/parse.h index 37f0439e..8e5acd72 100644 --- a/obt/parse.h +++ b/obt/parse.h @@ -19,8 +19,6 @@ #ifndef __obt_parse_h #define __obt_parse_h -#include "version.h" - #include <libxml/parser.h> #include <glib.h> diff --git a/obt/version.h.in b/obt/version.h.in new file mode 100644 index 00000000..8adfcf8d --- /dev/null +++ b/obt/version.h.in @@ -0,0 +1,15 @@ +#ifndef obt__version_h +#define obt__version_h + +#define OBT_MAJOR_VERSION @OBT_MAJOR_VERSION@ +#define OBT_MINOR_VERSION @OBT_MINOR_VERSION@ +#define OBT_MICRO_VERSION @OBT_MICRO_VERSION@ +#define OBT_VERSION OBT_MAJOR_VERSION.OBT_MINOR_VERSION.OBT_MICRO_VERSION + +#define OBT_CHECK_VERSION(major,minor,micro) \ + (OBT_MAJOR_VERSION > (major) || \ + (OBT_MAJOR_VERSION == (major) && OBT_MINOR_VERSION > (minor)) || \ + (OBT_MAJOR_VERSION == (major) && OBT_MINOR_VERSION == (minor) && \ + OBT_MICRO_VERSION >= (micro))) + +#endif |