diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-03 00:52:05 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-03 00:52:05 +0000 |
| commit | dd99ea8e6203f1af361ed20e10680ccdc87d1920 (patch) | |
| tree | 6f934a51635fc46632de5c4240863b7aac364cfa /include/asterisk/compiler.h | |
| parent | d3d057390c26ce35b54750705377c4d3ff4e42bd (diff) | |
Merge revision 153709 from trunk
------------------------------------------------------------------------
r153709 | kpfleming | 2008-11-02 17:34:39 -0600 (Sun, 02 Nov 2008) | 3 lines
instead of trying to forcibly load res_agi when app_stack is loaded (even if the administrator didn't want it loaded), use GCC weak symbols to determine whether it was loaded already or not; if it was loaded, then use it.
------------------------------------------------------------------------
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@153745 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/compiler.h')
| -rw-r--r-- | include/asterisk/compiler.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asterisk/compiler.h b/include/asterisk/compiler.h index bc0476527..0fe1b6d0c 100644 --- a/include/asterisk/compiler.h +++ b/include/asterisk/compiler.h @@ -53,4 +53,10 @@ #define attribute_malloc #endif +#ifdef HAVE_ATTRIBUTE_weak +#define attribute_weak __attribute__((weak)) +#else +#define attribute_weak +#endif + #endif /* _ASTERISK_COMPILER_H */ |