summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGirish Pattabiraman <[email protected]>2017-02-08 15:17:24 -0800
committerGirish Pattabiraman <[email protected]>2017-02-08 15:17:24 -0800
commitfe0b6f422c742f5c97f33cfe89022cbd238c5774 (patch)
tree181055adf2309082e91c25d5a478ef616422b0d2
parent42cd81689c12568ae4451fe956da6bb5e453e058 (diff)
Removed definition of "void __cdecl operator delete(void *)" to avoid linker error with stdunk.lib
-rw-r--r--audio/sysvad/EndpointsCommon/NewDelete.cpp24
1 files 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_