From 4951ecb0eb433a6d861249c8558e7aec4f63fe5c Mon Sep 17 00:00:00 2001
From: jan <jan@152afb58-edef-0310-8abb-c4023f1b3aa9>
Date: Mon, 19 Feb 2007 21:46:15 +0000
Subject: win32 specific fixes

git-svn-id: svn://svn.lighttpd.net/lighttpd/trunk@1670 152afb58-edef-0310-8abb-c4023f1b3aa9
---
 src/base.h               | 2 +-
 src/mod_sql_vhost_core.c | 1 +
 src/mod_webdav.c         | 6 +++++-
 src/sys-files.h          | 2 ++
 src/sys-mmap.h           | 2 ++
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/base.h b/src/base.h
index 2655aa5f..22e856ed 100644
--- a/src/base.h
+++ b/src/base.h
@@ -69,7 +69,7 @@
 #ifdef __APPLE__
 #include <crt_externs.h>
 #define environ (* _NSGetEnviron())
-#else
+#elif !defined(_WIN32)
 extern char **environ;
 #endif
 
diff --git a/src/mod_sql_vhost_core.c b/src/mod_sql_vhost_core.c
index deca24e3..6957971d 100644
--- a/src/mod_sql_vhost_core.c
+++ b/src/mod_sql_vhost_core.c
@@ -9,6 +9,7 @@
 
 #include "plugin.h"
 #include "log.h"
+#include "sys-files.h"
 
 #include "stat_cache.h"
 
diff --git a/src/mod_webdav.c b/src/mod_webdav.c
index 7501d1a6..fb3dc5c2 100644
--- a/src/mod_webdav.c
+++ b/src/mod_webdav.c
@@ -46,9 +46,13 @@
  * - for now it is read-only and we only support PROPFIND
  *
  */
-
+#ifdef _WIN32
+#define WEBDAV_FILE_MODE _S_IREAD | _S_IWRITE
+#define WEBDAV_DIR_MODE  _S_IREAD | _S_IWRITE
+#else
 #define WEBDAV_FILE_MODE S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH
 #define WEBDAV_DIR_MODE  S_IRWXU | S_IRWXG | S_IRWXO
+#endif
 
 /* plugin config for all request/connections */
 
diff --git a/src/sys-files.h b/src/sys-files.h
index 093bccb5..13d6c6c8 100644
--- a/src/sys-files.h
+++ b/src/sys-files.h
@@ -6,6 +6,8 @@
 #define DIR_SEPERATOR_WIN       '\\'
 #define DIR_SEPERATOR_WIN_STR   "\\"
 
+#include "settings.h"
+
 #ifdef _WIN32
 #include <windows.h>
 #include <io.h>     /* open */
diff --git a/src/sys-mmap.h b/src/sys-mmap.h
index 9dc745d0..560987b3 100644
--- a/src/sys-mmap.h
+++ b/src/sys-mmap.h
@@ -1,6 +1,8 @@
 #ifndef WIN32_MMAP_H
 #define WIN32_MMAP_H
 
+#include "settings.h"
+
 #ifdef _WIN32
 
 #define MAP_FAILED -1
-- 
cgit v1.2.1