diff options
| author | Benny Prijono <bennylp@teluu.com> | 2012-04-27 09:47:20 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2012-04-27 09:47:20 +0000 |
| commit | 6cd2812a2778acf0a4a19b5e070c2a0d426d9e93 (patch) | |
| tree | cbbbf6b5af2e1bef00e48225532d64fa00ed2e26 /pjlib/src | |
| parent | 22098b13d8be9412bcc63202b99160838b099f80 (diff) | |
Changed version to 2.0-rc
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4112 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src')
| -rw-r--r-- | pjlib/src/pj/config.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/pjlib/src/pj/config.c b/pjlib/src/pj/config.c index 41d8b660..83ba55da 100644 --- a/pjlib/src/pj/config.c +++ b/pjlib/src/pj/config.c @@ -23,13 +23,22 @@ static const char *id = "config.c"; -#define PJ_MAKE_VERSION1(a,b,c,d) #a "." #b "." #c d -#define PJ_MAKE_VERSION2(a,b,c,d) PJ_MAKE_VERSION1(a,b,c,d) +#define PJ_MAKE_VERSION3_1(a,b,d) #a "." #b d +#define PJ_MAKE_VERSION3_2(a,b,d) PJ_MAKE_VERSION3_1(a,b,d) -PJ_DEF_DATA(const char*) PJ_VERSION = PJ_MAKE_VERSION2(PJ_VERSION_NUM_MAJOR, - PJ_VERSION_NUM_MINOR, - PJ_VERSION_NUM_REV, - PJ_VERSION_NUM_EXTRA); +#define PJ_MAKE_VERSION4_1(a,b,c,d) #a "." #b "." #c d +#define PJ_MAKE_VERSION4_2(a,b,c,d) PJ_MAKE_VERSION4_1(a,b,c,d) + +#if PJ_VERSION_NUM_REV +PJ_DEF_DATA(const char*) PJ_VERSION = PJ_MAKE_VERSION4_2(PJ_VERSION_NUM_MAJOR, + PJ_VERSION_NUM_MINOR, + PJ_VERSION_NUM_REV, + PJ_VERSION_NUM_EXTRA); +#else +PJ_DEF_DATA(const char*) PJ_VERSION = PJ_MAKE_VERSION3_2(PJ_VERSION_NUM_MAJOR, + PJ_VERSION_NUM_MINOR, + PJ_VERSION_NUM_EXTRA); +#endif /* * Get PJLIB version string. |