Bring win32 up to date with compat changes

src/compat.h

@@ -6,15 +6,16 @@
 #endif
 
 #ifndef HAVE_STRCASESTR
-extern char * strcasestr(char* haystack, char* needle);
+extern char *strcasestr(char* haystack, char* needle);
 #endif
 
 #ifndef HAVE_STRPTIME
-char * strptime( char *buf, char *fmt, struct tm *tm );
+extern char *strptime(char *buf, char *fmt, struct tm *tm );
 #endif
 
 #ifndef HAVE_STRTOK_R
-extern char *strtok_r(char *s, const char *delim, char **last);
+#undef strtok_r /* defend against win32 pthreads */
+extern char *strtok_r(char *s, char *delim, char **last);
 #endif
 
 #ifndef HAVE_TIMEGM

src/os-win32.c

@@ -2,11 +2,15 @@
  *
  */
 
-#include <errno.h>
-#include <pthread.h>
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <time.h>
+#include <pthread.h>
 
 #include "daapd.h"
 #include "win32.h"

src/scan-xml.c

@@ -32,6 +32,7 @@
 #include <sys/stat.h>
 #include <time.h>
 
+#include "daapd.h"
 #include "db-generic.h"
 #include "err.h"
 #include "mp3-scanner.h"

src/smart-parser.c

@@ -19,6 +19,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "daapd.h"
 #include "err.h"
 
 #ifdef HAVE_SQL