minor header cleanup

svn path=/icecast/trunk/icecast/; revision=14219

src/compat.h

@@ -20,12 +20,20 @@
  * Solaris.
  */
 
-#ifdef _WIN32
+#ifdef HAVE_UNISTD_H
-#include <windows.h>
-#else
 #include <unistd.h>
 #endif
 
+#ifdef TIME_WITH_SYS_TIME
+#  include <sys/time.h>
+#  include <time.h>
+#else
+#  ifdef HAVE_SYS_TIME_H
+#    include <sys/time.h>
+#  else
+#    include <time.h>
+#  endif
+#endif
 
 /* Make sure we define 64 bit types */
 #ifdef _WIN32

src/connection.c

@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <time.h>
 #ifdef HAVE_POLL
 #include <sys/poll.h>
 #endif
@@ -27,7 +26,6 @@
 #include <sys/stat.h>
 
 #ifndef _WIN32
-#include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #else

src/main.c

@@ -56,6 +56,7 @@
 #ifdef _WIN32
 /* For getpid() */
 #include <process.h>
+#include <windows.h>
 #define snprintf _snprintf
 #define getpid _getpid
 #endif

src/slave.c

@@ -25,11 +25,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <sys/types.h>
 
 #ifndef _WIN32
-#include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #else