X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_memory_functions.cpp;h=134c2136f9442900aab30f82f8033c25988c4e77;hb=4f9abe96a4301a740d4a5fd7932550d88d60a3fc;hp=4d8444f4c231dd115cd05e36fbb7531cd11205bd;hpb=5b9682275e384635a1fd9f7320cf4d9a604a43b4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/win/inspircd_memory_functions.cpp b/win/inspircd_memory_functions.cpp index 4d8444f4c..134c2136f 100644 --- a/win/inspircd_memory_functions.cpp +++ b/win/inspircd_memory_functions.cpp @@ -1,6 +1,12 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2013 Sadie Powell + * Copyright (C) 2012 Robby + * Copyright (C) 2012 ChrisTX + * Copyright (C) 2011, 2013 Adam + * Copyright (C) 2009 John Brooks + * Copyright (C) 2007-2008 Craig Edwards * Copyright (C) 2007 Dennis Friis * * This file is part of InspIRCd. InspIRCd is free software: you can @@ -17,7 +23,7 @@ */ -#include "inspircd_win32wrapper.h" +#include #include #include #include @@ -26,7 +32,7 @@ * 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. @@ -50,7 +56,8 @@ void ::operator delete(void * ptr) HeapFree(GetProcessHeap(), 0, ptr); } -void * operator new[] (size_t iSize) { +void * operator new[] (size_t iSize) +{ void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize); if (!ptr) throw std::bad_alloc();