From: Mark H. <mha...@us...> - 2007-05-24 12:50:50
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11967/Pythonwin/Scintilla/win32 Modified Files: PlatWin.cxx scintilla_vc6.mak Log Message: Get pythonwin working in x64 - via "[ 1705634 ] VC8.0 build patch for AMD64 branch" - thanks to Steve Yin for his excellent contribution Index: scintilla_vc6.mak =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32/scintilla_vc6.mak,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** scintilla_vc6.mak 25 Nov 2003 10:45:21 -0000 1.2 --- scintilla_vc6.mak 24 May 2007 12:50:50 -0000 1.3 *************** *** 37,41 **** #-Zc:forScope -Zc:wchar_t ! CXXFLAGS=-Zi -TP -W4 # For something scary:-Wp64 CXXDEBUG=-Od -MTd -DDEBUG --- 37,41 ---- #-Zc:forScope -Zc:wchar_t ! CXXFLAGS=-Zi -TP -W4 -D_CRT_SECURE_NO_DEPRECATE # For something scary:-Wp64 CXXDEBUG=-Od -MTd -DDEBUG Index: PlatWin.cxx =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32/PlatWin.cxx,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PlatWin.cxx 25 Nov 2003 10:45:21 -0000 1.12 --- PlatWin.cxx 24 May 2007 12:50:50 -0000 1.13 *************** *** 953,957 **** void Draw(DRAWITEMSTRUCT *pDrawItem); long WndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam); ! static long PASCAL StaticWndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam); }; --- 953,957 ---- void Draw(DRAWITEMSTRUCT *pDrawItem); long WndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam); ! static LRESULT PASCAL StaticWndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam); }; *************** *** 1183,1187 **** } ! long PASCAL ListBoxX::StaticWndProc( HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) { if (iMessage == WM_CREATE) { --- 1183,1187 ---- } ! LRESULT PASCAL ListBoxX::StaticWndProc( HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) { if (iMessage == WM_CREATE) { |