From 470870f3fcb117df7f9d565b7466ba1783657ca5 Mon Sep 17 00:00:00 2001
From: Sean Bright <sean@malleable.com>
Date: Mon, 1 Dec 2008 21:07:48 +0000
Subject: [PATCH] Merged revisions 154919 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

........
  r154919 | seanbright | 2008-11-05 17:01:22 -0500 (Wed, 05 Nov 2008) | 2 lines

  Fix a problem found while building res_snmp.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@160096 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 include/asterisk.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/asterisk.h b/include/asterisk.h
index eed328e9d9..d83cc3dda6 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -176,6 +176,14 @@ struct ast_module;
 struct ast_variable;
 struct ast_str;
 
+#ifdef bzero
+#undef bzero
+#endif
+
+#ifdef bcopy
+#undef bcopy
+#endif
+
 #define bzero  0x__dont_use_bzero__use_memset_instead""
 #define bcopy  0x__dont_use_bcopy__use_memmove_instead()