/*
* InspIRCd -- Internet Relay Chat Daemon
*
+ * Copyright (C) 2013 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ * Copyright (C) 2011, 2013 Adam <Adam@anope.org>
+ * Copyright (C) 2009 John Brooks <special@inspircd.org>
+ * Copyright (C) 2007-2008 Craig Edwards <brain@inspircd.org>
* Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
*
* This file is part of InspIRCd. InspIRCd is free software: you can
*/
-#include "inspircd_win32wrapper.h"
+#include <windows.h>
#include <exception>
#include <new>
#include <new.h>
* whereas on POSIX systems, shared objects loaded into an executable share
* the executable's heap. This means that if we pass an arbitrary pointer to
* a windows DLL which is not allocated in that dll, without some form of
- * marshalling, we get a page fault. To fix this, these overrided operators
+ * marshalling, we get a page fault. To fix this, these overridden operators
* new and delete use the windows HeapAlloc and HeapFree functions to claim
* memory from the windows global heap. This makes windows 'act like' POSIX
* when it comes to memory usage between dlls and exes.
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
*/
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