From: Joshua Colp <jcolp@digium.com>
Date: Sun, 4 May 2008 01:52:00 +0000 (+0000)
Subject: Merged revisions 115279 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~2323
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9aeffd14cb728be0a57e863de839287eaed80c90;p=thirdparty%2Fasterisk.git

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.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115280 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/compiler.h b/include/asterisk/compiler.h
index 0eb3c0afdd..12b8ee728a 100644
--- a/include/asterisk/compiler.h
+++ b/include/asterisk/compiler.h
@@ -23,37 +23,37 @@
 #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
 #endif
 
-#if HAVE_ATTRIBUTE_sentinel
+#ifdef HAVE_ATTRIBUTE_sentinel
 #define attribute_sentinel __attribute__((sentinel))
 #else
 #define attribute_sentinel