[asterisk-commits] seanbright: branch 1.6.0 r160096 - in /branches/1.6.0: ./ include/asterisk.h

[SVN commits to the Asterisk project]

Author: seanbright
Date: Mon Dec  1 15:07:48 2008
New Revision: 160096

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160096
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.0/   (props changed)
    branches/1.6.0/include/asterisk.h

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

Modified: branches/1.6.0/include/asterisk.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk.h?view=diff&rev=160096&r1=160095&r2=160096
==============================================================================
--- branches/1.6.0/include/asterisk.h (original)
+++ branches/1.6.0/include/asterisk.h Mon Dec  1 15:07:48 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()