/*
 * gramp.h - SiriDB Grammar Properties.
 *
 * Note: we need this file up-to-date with the grammar. The grammar has
 *       keywords starting with K_ so the will all be sorted.
 *       KW_OFFSET should be set to the first keyword and KW_COUNT needs the
 *       last keyword in the grammar.
 *
 */
#ifndef SIRI_GRAMP_H_
#define SIRI_GRAMP_H_

#include <siri/grammar/grammar.h>

/* keywords */
#define KW_OFFSET CLERI_GID_K_ACCESS
#define KW_COUNT CLERI_GID_K_WRITE + 1 - KW_OFFSET

/* aggregation functions */
#define F_OFFSET CLERI_GID_F_COUNT

/* help statements */
#define HELP_OFFSET CLERI_GID_HELP_ACCESS
#define HELP_COUNT CLERI_GID_HELP_TIMEZONES + 1 - HELP_OFFSET



#if CLERI_VERSION_MINOR >= 12
#define CLERI_NODE_DATA(__node) ((intptr_t)(__node)->data)
#define CLERI_NODE_DATA_ADDR(__node) ((intptr_t *) &(__node)->data)
#else
#define CLERI_NODE_DATA(__node) (__node)->result
#define CLERI_NODE_DATA_ADDR(__node) &(__node)->result
#endif

#endif  /* SIRI_GRAMP_H_ */

/*
 * gramp.h - SiriDB Grammar Properties.
 *
 * Note: we need this file up-to-date with the grammar. The grammar has
 *       keywords starting with K_ so the will all be sorted.
 *       KW_OFFSET should be set to the first keyword and KW_COUNT needs the
 *       last keyword in the grammar.
 *
 */
#ifndef SIRI_GRAMP_H_
#define SIRI_GRAMP_H_

#include <siri/grammar/grammar.h>

/* keywords */
#define KW_OFFSET CLERI_GID_K_ACCESS
#define KW_COUNT CLERI_GID_K_WRITE + 1 - KW_OFFSET

/* aggregation functions */
#define F_OFFSET CLERI_GID_F_COUNT

/* help statements */
#define HELP_OFFSET CLERI_GID_HELP_ACCESS
#define HELP_COUNT CLERI_GID_HELP_TIMEZONES + 1 - HELP_OFFSET



#if CLERI_VERSION_MINOR >= 12
#define CLERI_NODE_DATA(__node) ((intptr_t)(__node)->data)
#define CLERI_NODE_DATA_ADDR(__node) ((intptr_t *) &(__node)->data)
#else
#define CLERI_NODE_DATA(__node) ((intptr_t)(__node)->result)
#define CLERI_NODE_DATA_ADDR(__node) ((intptr_t *) &(__node)->result)
#endif

#endif  /* SIRI_GRAMP_H_ */

--- 
+++ 
@@ -29,8 +29,8 @@
 #define CLERI_NODE_DATA(__node) ((intptr_t)(__node)->data)
 #define CLERI_NODE_DATA_ADDR(__node) ((intptr_t *) &(__node)->data)
 #else
-#define CLERI_NODE_DATA(__node) ((intptr_t)(__node)->result)
-#define CLERI_NODE_DATA_ADDR(__node) ((intptr_t *) &(__node)->result)
+#define CLERI_NODE_DATA(__node) (__node)->result
+#define CLERI_NODE_DATA_ADDR(__node) &(__node)->result
 #endif
 
 #endif  /* SIRI_GRAMP_H_ */
Update compat with old libcleri
