diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2011-07-19 03:42:28 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2011-07-19 03:42:28 +0000 |
commit | cd283c8825c9a94400f27735acb1c9385e90ffc8 (patch) | |
tree | 56d5722310fa8957ce5d1ba7cbd137cf8802dcc7 /pjlib/include/pj/config.h | |
parent | ed8f8d08abba9040f769e922aa0c1adbde86fbbc (diff) |
Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn".
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3664 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/include/pj/config.h')
-rw-r--r-- | pjlib/include/pj/config.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h index 25758452..ec7c7449 100644 --- a/pjlib/include/pj/config.h +++ b/pjlib/include/pj/config.h @@ -20,7 +20,6 @@ #ifndef __PJ_CONFIG_H__ #define __PJ_CONFIG_H__ -#error "For PJSIP version 1.x, please switch your svn repository URL to https://svn.pjsip.org/repos/pjproject/branches/1.x" /** * @file config.h @@ -46,6 +45,10 @@ # error "Unknown compiler." #endif +/* PJ_ALIGN_DATA is compiler specific directive to align data address */ +#ifndef PJ_ALIGN_DATA +# error "PJ_ALIGN_DATA is not defined!" +#endif /******************************************************************** * Include target OS specific configuration. @@ -1122,10 +1125,10 @@ PJ_BEGIN_DECL /** PJLIB version major number. */ -#define PJ_VERSION_NUM_MAJOR 1 +#define PJ_VERSION_NUM_MAJOR 2 /** PJLIB version minor number. */ -#define PJ_VERSION_NUM_MINOR 10 +#define PJ_VERSION_NUM_MINOR 0 /** PJLIB version revision number. */ #define PJ_VERSION_NUM_REV 0 @@ -1134,7 +1137,7 @@ PJ_BEGIN_DECL * Extra suffix for the version (e.g. "-trunk"), or empty for * web release version. */ -#define PJ_VERSION_NUM_EXTRA "-svn" +#define PJ_VERSION_NUM_EXTRA "-pre-alpha-svn" /** * PJLIB version number consists of three bytes with the following format: |