aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk/astobj.h
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-06-24 22:45:15 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-06-24 22:45:15 +0000
commit889ce1c0e880478f7269c0751675e8e69ba6ffc0 (patch)
tree3f0f4640d39f272360a860fb49ea3a284b99f757 /include/asterisk/astobj.h
parentca7d7865a73c71dbd4e180acb2f71892816bd30e (diff)
split up string/time functions into separate header files
make more LOW_MEMORY optimizations, and ensure that a non-inline version of each inlinable function is always available (for external modules) move compiler-specific stuff into a separate header file git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6008 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/astobj.h')
-rwxr-xr-xinclude/asterisk/astobj.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asterisk/astobj.h b/include/asterisk/astobj.h
index ac1b280d7..96876ba18 100755
--- a/include/asterisk/astobj.h
+++ b/include/asterisk/astobj.h
@@ -15,7 +15,9 @@
#define _ASTERISK_ASTOBJ_H
#include <string.h>
+
#include "asterisk/lock.h"
+#include "asterisk/compiler.h"
/*! \file
* \brief A set of macros implementing objects and containers.
@@ -84,10 +86,6 @@ extern "C" {
#define ASTOBJ_FLAG_MARKED (1 << 0) /* Object has been marked for future operation */
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
-#define __builtin_expect(exp, c) (exp)
-#endif
-
/* C++ is simply a syntactic crutch for those who cannot think for themselves
in an object oriented way. */