[svn-commits] tilghman: branch 1.6.0 r117089 - in /branches/1.6.0: ./ include/asterisk/utils.h

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon May 19 11:07:53 2008
New Revision: 117089

URL: http://svn.digium.com/view/asterisk?view=rev&rev=117089
Log:
Merged revisions 117088 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r117088 | tilghman | 2008-05-19 11:07:09 -0500 (Mon, 19 May 2008) | 10 lines

Merged revisions 117086 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r117086 | tilghman | 2008-05-19 11:05:05 -0500 (Mon, 19 May 2008) | 2 lines

The addition of usleep(2) within ast_assert requires the inclusion of the unistd.h header

........

................

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

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

Modified: branches/1.6.0/include/asterisk/utils.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/utils.h?view=diff&rev=117089&r1=117088&r2=117089
==============================================================================
--- branches/1.6.0/include/asterisk/utils.h (original)
+++ branches/1.6.0/include/asterisk/utils.h Mon May 19 11:07:53 2008
@@ -26,6 +26,7 @@
 #include "asterisk/network.h"
 
 #include <time.h>	/* we want to override localtime_r */
+#include <unistd.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/time.h"