Fix checking whether kqueue is available.

[user/henk/code/inspircd.git] / win / inspircd_memory_functions.cpp

diff --git a/win/inspircd_memory_functions.cpp b/win/inspircd_memory_functions.cpp
index afff4287eb591cf42337f41941a6eb5c5db508d0..3987083172f5c2ae8c4c729f4498c95e6ed90d3b 100644 (file)
--- a/win/inspircd_memory_functions.cpp
+++ b/win/inspircd_memory_functions.cpp
@@ -1,17 +1,22 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd_win32wrapper.h"
+#include <windows.h>
 #include <exception>
 #include <new>
 #include <new.h>
@@ -28,7 +33,7 @@
 
 void * ::operator new(size_t iSize)
 {
-       void* ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iSize);               /* zero memory for unix compatibility */
+       void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize);
        /* This is the correct behaviour according to C++ standards for out of memory,
         * not returning null -- Brain
         */
@@ -40,5 +45,21 @@ void * ::operator new(size_t iSize)
 
 void ::operator delete(void * ptr)
 {
-       HeapFree(GetProcessHeap(), 0, ptr);
+       if (ptr)
+               HeapFree(GetProcessHeap(), 0, ptr);
+}
+
+void * operator new[] (size_t iSize)
+{
+       void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize);
+       if (!ptr)
+               throw std::bad_alloc();
+       else
+               return ptr;
+}
+
+void operator delete[] (void* ptr)
+{
+       if (ptr)
+               HeapFree(GetProcessHeap(), 0, ptr);
 }