[asterisk-commits] seanbright: branch 1.6.1 r154920 - in /branches/1.6.1: ./ include/asterisk.h

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed Nov  5 16:02:19 2008
New Revision: 154920

URL: http://svn.digium.com/view/asterisk?view=rev&rev=154920
Log:
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.
........

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

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

Modified: branches/1.6.1/include/asterisk.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/include/asterisk.h?view=diff&rev=154920&r1=154919&r2=154920
==============================================================================
--- branches/1.6.1/include/asterisk.h (original)
+++ branches/1.6.1/include/asterisk.h Wed Nov  5 16:02:19 2008
@@ -176,6 +176,14 @@
 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()