commit 9aec91948d134745c29ff63d32d46ac2c367306a
author Damien Miller <djm@mindrot.org> Sat Aug 05 10:57:45 2006 +1000
committer Damien Miller <djm@mindrot.org> Sat Aug 05 10:57:45 2006 +1000
tree 7eabd48bafaea56e6dbe8337aad6ed975fec1fb1
parent 7c6e4b059c29c695d3c411f5fa83abe953225e21

   - stevesk@cvs.openbsd.org 2006/07/25 02:59:21
     [channels.c clientloop.c packet.c scp.c serverloop.c sftp-client.c]
     [sftp-server.c ssh-agent.c ssh-keyscan.c sshconnect.c sshd.c]
     move #include <sys/time.h> out of includes.h

includes.h

diff --git a/includes.h b/includes.h
index 7a7bd81..fc85e67 100644
--- a/includes.h
+++ b/includes.h
@@ -20,6 +20,7 @@
 
 #define _GNU_SOURCE /* activate extra prototypes for glibc */
 
+#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -69,19 +70,12 @@
 #  include <utmp.h>
 #endif
 #ifdef HAVE_UTMPX_H
-#  ifdef HAVE_TV_IN_UTMPX
-#    include <sys/time.h>
-#  endif
 #  include <utmpx.h>
 #endif
 #ifdef HAVE_LASTLOG_H
 #  include <lastlog.h>
 #endif
 
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h> /* For timersub */
-#endif
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif