[asterisk-commits] twilson: branch twilson/config_work r362876 - in /team/twilson/config_work: ....

[SVN commits to the Asterisk project]

Author: twilson
Date: Fri Apr 20 11:19:29 2012
New Revision: 362876

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=362876
Log:
More making gcc 4.4 happy

Also added -Wtrampolines to dev mode since I'm using nested functions
for RAII_VAR. This should cause compilation to fail if we ever do
accidentally do something that might require an executable stack.

Modified:
    team/twilson/config_work/Makefile
    team/twilson/config_work/include/asterisk/utils.h

Modified: team/twilson/config_work/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/twilson/config_work/Makefile?view=diff&rev=362876&r1=362875&r2=362876
==============================================================================
--- team/twilson/config_work/Makefile (original)
+++ team/twilson/config_work/Makefile Fri Apr 20 11:19:29 2012
@@ -194,6 +194,7 @@
   _ASTCFLAGS+=-Wundef
   _ASTCFLAGS+=-Wmissing-format-attribute
   _ASTCFLAGS+=-Wformat=2
+  _ASTCFLAGS+=-Wtrampolines
   ifeq ($(AST_DEVMODE_STRICT),yes)
     _ASTCFLAGS+=-Wshadow
   endif

Modified: team/twilson/config_work/include/asterisk/utils.h
URL: http://svnview.digium.com/svn/asterisk/team/twilson/config_work/include/asterisk/utils.h?view=diff&rev=362876&r1=362875&r2=362876
==============================================================================
--- team/twilson/config_work/include/asterisk/utils.h (original)
+++ team/twilson/config_work/include/asterisk/utils.h Fri Apr 20 11:19:29 2012
@@ -864,6 +864,7 @@
 char *ast_utils_which(const char *binary, char *fullpath, size_t fullpath_size);
 
 #define RAII_VAR(vartype,varname,initval,dtor) \
+    auto void _dtor_ ## varname (vartype * v); \
     auto void _dtor_ ## varname (vartype * v) { dtor(*v); } \
     vartype varname __attribute__((cleanup(_dtor_ ## varname))) = (initval)