From c5b9eaeda030638a6fbd59396f7ad61baaf70fad Mon Sep 17 00:00:00 2001
From: cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Wed, 26 Nov 2008 01:41:39 +0000
Subject: Various fixes for compiling under Windows. Also updated ms_* modules
 to use std::vector Memo struct from earlier commit.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1797 5417fbe8-f217-4b02-8779-1006273d7864
---
 src/tools/db-convert.c | 3 ++-
 src/tools/db-merger.c  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/tools')

diff --git a/src/tools/db-convert.c b/src/tools/db-convert.c
index d61e9c417..7093f2960 100644
--- a/src/tools/db-convert.c
+++ b/src/tools/db-convert.c
@@ -27,6 +27,7 @@
 #else
 #include "sysconf.h"
 #include <windows.h>
+#include <io.h>
 #endif
 
 #include <string>
@@ -1079,7 +1080,7 @@ dbFILE *open_db_write(const char *service, const char *filename, int version)
 #ifndef _WIN32
 	fd = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0666);
 #else
-	fd = open(filename, O_WRONLY | O_CREAT | O_EXCL | _O_BINARY, 0666);
+	fd = _open(filename, O_WRONLY | O_CREAT | O_EXCL | _O_BINARY, 0666);
 #endif
 	f->fp = fdopen(fd, "wb");   /* will fail and return NULL if fd < 0 */
 	if (!f->fp || !write_file_version(f, version)) {
diff --git a/src/tools/db-merger.c b/src/tools/db-merger.c
index c141e8382..81d03bba8 100644
--- a/src/tools/db-merger.c
+++ b/src/tools/db-merger.c
@@ -57,6 +57,8 @@
 #else
 #include "sysconf.h"
 #include <windows.h>
+#include <io.h>
+#define open _open
 #endif
 
 /* Some SUN fixs */
-- 
cgit