Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[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 e40e09c9ca3ae91f7a40332fa802cb494022c5a2..3987083172f5c2ae8c4c729f4498c95e6ed90d3b 100644 (file)
--- a/win/inspircd_memory_functions.cpp
+++ b/win/inspircd_memory_functions.cpp
@@ -16,8 +16,7 @@
  * 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>
@@ -34,7 +33,7 @@
 
 void * ::operator new(size_t iSize)
 {
-       void* ptr = HeapAlloc(GetProcessHeap(), 0, 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
         */
@@ -50,8 +49,9 @@ void ::operator delete(void * ptr)
                HeapFree(GetProcessHeap(), 0, ptr);
 }
 
-void * operator new[] (size_t iSize) {
-       void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize); /* Why were we initializing the memory to zeros here? This is just a waste of cpu! */
+void * operator new[] (size_t iSize)
+{
+       void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize);
        if (!ptr)
                throw std::bad_alloc();
        else