From fe0b6f422c742f5c97f33cfe89022cbd238c5774 Mon Sep 17 00:00:00 2001 From: Girish Pattabiraman Date: Wed, 8 Feb 2017 15:17:24 -0800 Subject: Removed definition of "void __cdecl operator delete(void *)" to avoid linker error with stdunk.lib --- audio/sysvad/EndpointsCommon/NewDelete.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/audio/sysvad/EndpointsCommon/NewDelete.cpp b/audio/sysvad/EndpointsCommon/NewDelete.cpp index 584d28e8..406b4245 100644 --- a/audio/sysvad/EndpointsCommon/NewDelete.cpp +++ b/audio/sysvad/EndpointsCommon/NewDelete.cpp @@ -124,16 +124,19 @@ void __cdecl operator delete ***************************************************************************** * Basic Delete function. */ -void __cdecl operator delete -( - PVOID pVoid -) -{ - if (pVoid) - { - ExFreePoolWithTag(pVoid, SYSVAD_POOLTAG); - } -} +/* Commented out as "void __cdecl operator delete(void *) is already defined + * in stdunk.lib + */ +// void __cdecl operator delete +// ( +// PVOID pVoid +// ) +// { +// if (pVoid) +// { +// ExFreePoolWithTag(pVoid, SYSVAD_POOLTAG); +// } +// } /***************************************************************************** @@ -172,3 +175,4 @@ void __cdecl operator delete[] } } +#endif _NEW_DELETE_OPERATORS_ -- cgit v1.3.1