[asterisk-commits] file: branch 1.6.0 r115281 - in /branches/1.6.0: ./ include/asterisk/compiler.h

[SVN commits to the Asterisk project]

Author: file
Date: Sat May  3 20:53:02 2008
New Revision: 115281

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115281
Log:
Merged revisions 115280 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r115280 | file | 2008-05-03 22:52:00 -0300 (Sat, 03 May 2008) | 10 lines

Merged revisions 115279 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115279 | file | 2008-05-03 22:50:59 -0300 (Sat, 03 May 2008) | 2 lines

For my next trick I will make these work with what our autoconf header file gives us.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/compiler.h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/compiler.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/compiler.h?view=diff&rev=115281&r1=115280&r2=115281
==============================================================================
--- branches/1.6.0/include/asterisk/compiler.h (original)
+++ branches/1.6.0/include/asterisk/compiler.h Sat May  3 20:53:02 2008
@@ -23,31 +23,31 @@
 #ifndef _ASTERISK_COMPILER_H
 #define _ASTERISK_COMPILER_H
 
-#if HAVE_ATTRIBUTE_always_inline
+#ifdef HAVE_ATTRIBUTE_always_inline
 #define force_inline __attribute__((always_inline)) inline
 #else
 #define force_inline inline
 #endif
 
-#if HAVE_ATTRIBUTE_pure
+#ifdef HAVE_ATTRIBUTE_pure
 #define attribute_pure __attribute__((pure))
 #else
 #define attribute_pure
 #endif
 
-#if HAVE_ATTRIBUTE_const
+#ifdef HAVE_ATTRIBUTE_const
 #define attribute_const __attribute__((const))
 #else
 #define attribute_const
 #endif
 
-#if HAVE_ATTRIBUTE_unused
+#ifdef HAVE_ATTRIBUTE_unused
 #define attribute_unused __attribute__((unused))
 #else
 #define attribute_unused
 #endif
 
-#if HAVE_ATTRIBUTE_malloc
+#ifdef HAVE_ATTRIBUTE_malloc
 #define attribute_malloc __attribute__((malloc))
 #else
 #define attribute_malloc