From 404b00c69ce60bbd55ce29c3fc1333a7acef1cfb Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Fri, 16 Nov 2007 03:49:01 +0000 Subject: Fixed bug in PJ_DECL_NO_RETURN macro which prevents building libraries as DLL git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1581 74dad513-b988-da41-8d7b-12977e46ad98 --- pjlib/include/pj/config.h | 53 ++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h index d5652578..2f05c0f7 100644 --- a/pjlib/include/pj/config.h +++ b/pjlib/include/pj/config.h @@ -694,32 +694,6 @@ */ #define PJ_INLINE(type) PJ_INLINE_SPECIFIER type -/** - * @def PJ_DECL_NO_RETURN(type) - * @param type The return type of the function. - * Declare a function that will not return. - */ -/** - * @def PJ_BEGIN_DECL - * Mark beginning of declaration section in a header file. - */ -/** - * @def PJ_END_DECL - * Mark end of declaration section in a header file. - */ -#ifdef __cplusplus -# define PJ_DECL_NO_RETURN(type) type PJ_NORETURN -# define PJ_IDECL_NO_RETURN(type) PJ_INLINE(type) PJ_NORETURN -# define PJ_BEGIN_DECL extern "C" { -# define PJ_END_DECL } -#else -# define PJ_DECL_NO_RETURN(type) PJ_NORETURN type -# define PJ_IDECL_NO_RETURN(type) PJ_NORETURN PJ_INLINE(type) -# define PJ_BEGIN_DECL -# define PJ_END_DECL -#endif - - /** * This macro declares platform/compiler specific specifier prefix * to be added to symbol declaration to export the symbol when PJLIB @@ -798,6 +772,33 @@ #endif +/** + * @def PJ_DECL_NO_RETURN(type) + * @param type The return type of the function. + * Declare a function that will not return. + */ +/** + * @def PJ_BEGIN_DECL + * Mark beginning of declaration section in a header file. + */ +/** + * @def PJ_END_DECL + * Mark end of declaration section in a header file. + */ +#ifdef __cplusplus +# define PJ_DECL_NO_RETURN(type) PJ_DECL(type) PJ_NORETURN +# define PJ_IDECL_NO_RETURN(type) PJ_INLINE(type) PJ_NORETURN +# define PJ_BEGIN_DECL extern "C" { +# define PJ_END_DECL } +#else +# define PJ_DECL_NO_RETURN(type) PJ_NORETURN PJ_DECL(type) +# define PJ_IDECL_NO_RETURN(type) PJ_NORETURN PJ_INLINE(type) +# define PJ_BEGIN_DECL +# define PJ_END_DECL +#endif + + + /** * @def PJ_DECL_DATA(type) * @param type The data type. -- cgit v1.2.3