From 3a4a5400b872e98b610d55ae87f843ae6b1f7e9c Mon Sep 17 00:00:00 2001 From: "SND\\kernelnet_cp" Date: Wed, 3 Oct 2012 12:11:28 +0000 Subject: [PATCH] [0.2.x] fixed : win32 build git-svn-id: https://pykd.svn.codeplex.com/svn@79986 9b283d60-5439-405e-af05-b73fd8c4d996 --- pykd/dbgengine.h | 4 +--- pykd/eventhandler.cpp | 2 +- pykd/eventhandler.h | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pykd/dbgengine.h b/pykd/dbgengine.h index 950c2b3..34e7bb3 100644 --- a/pykd/dbgengine.h +++ b/pykd/dbgengine.h @@ -63,8 +63,6 @@ void getStackTrace(std::vector &frames); // callback events -#define DEBUG_CALLBACK_METHODTYPE __cdecl - enum DEBUG_CALLBACK_RESULT { DebugCallbackProceed = 0, DebugCallbackNoChange = 1, @@ -75,7 +73,7 @@ enum DEBUG_CALLBACK_RESULT { struct DEBUG_EVENT_CALLBACK { - virtual DEBUG_CALLBACK_RESULT DEBUG_CALLBACK_METHODTYPE OnBreakpoint( ULONG bpId ) = 0; + virtual DEBUG_CALLBACK_RESULT OnBreakpoint( ULONG bpId ) = 0; }; void eventRegisterCallbacks( const DEBUG_EVENT_CALLBACK *callbacks ); diff --git a/pykd/eventhandler.cpp b/pykd/eventhandler.cpp index 05db8b8..cef87ac 100644 --- a/pykd/eventhandler.cpp +++ b/pykd/eventhandler.cpp @@ -23,7 +23,7 @@ EventHandler::~EventHandler() /////////////////////////////////////////////////////////////////////////////// -DEBUG_CALLBACK_RESULT DEBUG_CALLBACK_METHODTYPE EventHandlerImpl::OnBreakpoint( ULONG bpId ) +DEBUG_CALLBACK_RESULT EventHandlerImpl::OnBreakpoint( ULONG bpId ) { BpMap::iterator foundIt = m_bpMap.find( bpId ); if ( foundIt == m_bpMap.end() ) diff --git a/pykd/eventhandler.h b/pykd/eventhandler.h index 0fc9519..2343a3f 100644 --- a/pykd/eventhandler.h +++ b/pykd/eventhandler.h @@ -21,7 +21,7 @@ public: private: - virtual DEBUG_CALLBACK_RESULT DEBUG_CALLBACK_METHODTYPE OnBreakpoint( ULONG bpId ) = 0; + virtual DEBUG_CALLBACK_RESULT OnBreakpoint( ULONG bpId ) = 0; }; ////////////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ class EventHandlerWrap : public python::wrapper, public EventHandl public: - virtual DEBUG_CALLBACK_RESULT DEBUG_CALLBACK_METHODTYPE OnBreakpoint( ULONG Id ) { + virtual DEBUG_CALLBACK_RESULT OnBreakpoint( ULONG Id ) { return handler("onBreakpoint", Id); } @@ -100,7 +100,7 @@ public: private: - virtual DEBUG_CALLBACK_RESULT DEBUG_CALLBACK_METHODTYPE OnBreakpoint( ULONG bpId ); + virtual DEBUG_CALLBACK_RESULT OnBreakpoint( ULONG bpId ); private: