svn commit: lorikeet r593 - in trunk/heimdal/lib/roken: .

[lha at samba.org]

Author: lha
Date: 2006-10-19 04:53:46 +0000 (Thu, 19 Oct 2006)
New Revision: 593

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=593

Log:
merge from heimdal cvs - Maybe include <sys/time.h> and/or maybe include <time.h>.
Modified:
   trunk/heimdal/lib/roken/socket_wrapper.c


Changeset:
Modified: trunk/heimdal/lib/roken/socket_wrapper.c
===================================================================
--- trunk/heimdal/lib/roken/socket_wrapper.c	2006-10-19 04:36:07 UTC (rev 592)
+++ trunk/heimdal/lib/roken/socket_wrapper.c	2006-10-19 04:53:46 UTC (rev 593)
@@ -65,6 +65,14 @@
 #undef SOCKET_WRAPPER_REPLACE
 
 #include <sys/types.h>
+#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#elif defined(HAVE_SYS_TIME_H)
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>