Anyone mind if I replace
#define JK_VERSION (((JK_VERMAJOR) << 24) + ((JK_VERMINOR) << 16) + \
((JK_VERFIX) << 8) + (JK_VERBETA))
with
#define JK_MAKEVERSION(major, minor, fix, beta) \
(((major) << 24) + ((minor) << 16) + \
((fix) << 8) + (beta))
#define JK_VERSION \
JK_MAKEVERSION(JK_VERMAJOR, JK_VERMINOR, JK_VERFIX, JK_VERBETA)
?
Then you can have
#if defined(JK_VERSION) && JK_VERSION >= JK_MAKEVERSION(1, 2, 0, 1)
...
#endif
[snip]
> I have prepared a jk_version.h. I will commit it tomorrow (If I have time).
> Find it enclosed.
>
> ------------------------------------------------------------------------
> /* common/jk_version.h */
>
> /************** START OF AREA TO MODIFY BEFORE RELEASING *************/
> #define JK_VERMAJOR 1
> #define JK_VERMINOR 2
> #define JK_VERFIX 0
> #define JK_VERSTRING "1.2.0"
>
> /* Beta number */
> #define JK_VERBETA 1
> #define JK_BETASTRING "1"
> /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
> #define JK_VERISRELEASE 1
> /************** END OF AREA TO MODIFY BEFORE RELEASING *************/
>
> #define PACKAGE "mod_jk/"
> /* Build JK_EXPOSED_VERSION and JK_VERSION */
> #define JK_EXPOSED_VERSION_INT PACKAGE JK_VERSTRING
>
> #if ( JK_VERISRELEASE == 1 )
> #define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT
> #undef JK_VERBETA
> #define JK_VERBETA 255
> #else
> #define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-beta-" JK_BETASTRING
> #endif
>
> #define JK_VERSION (((JK_VERMAJOR) << 24) + ((JK_VERMINOR) << 16) + \
> ((JK_VERFIX) << 8) + (JK_VERBETA))
--
Andy Armstrong, Tagish
