Dennis Schridde schreef:
> Author: devurandom
> Date: Sun Nov 26 12:39:54 2006
> New Revision: 504
>
> URL: http://svn.gna.org/viewcvs/warzone?rev=504&view=rev
> Log:
> Not yet changed parts from patches of Christian Ohm:
> 003 - Remove all references to hWnd
> 004 - Remove DirectDraw flag
> 005 - Remove DDrawDriverName and D3DDriverName
> 006 - Remove all references to hInstance
> 007 - Remove some unused Windows types
> 008 - Remove VidMem parameter
> 009 - Remove bitdepth variables
>
> Modified:
>     trunk/lib/gamelib/ptrlist.c
>     trunk/lib/ivis_common/piestate.h
>     trunk/lib/netplay/netplay.c
>     trunk/lib/sound/audio.c
>     trunk/lib/sound/track.c
>     trunk/lib/widget/scrap.c
>     trunk/src/disp2d.c
>     trunk/src/displaydef.h
>     trunk/src/warzoneconfig.c
>   
The changes to trunk/lib/widget/scrap.c cause a compiler error
(comparison of int with pointer). This error will only be raised while
compiling a Windows build. I don't have the patches but according to the
description above I'm guessing number 003.

Also the previous style of comparing those two values would result in
comparing pointer-addresses rather than a value comparison.
(See the typedef of HWND in windef.h).

So attached is a patch to fix it.

--
Giel
Index: lib/widget/scrap.c
===================================================================
--- lib/widget/scrap.c  (revision 509)
+++ lib/widget/scrap.c  (working copy)
@@ -324,7 +324,7 @@
 
 #elif defined(WIN_SCRAP)
 /* * */
-  retval = ( GetClipboardOwner() != SDL_Window );
+  retval = ( GetClipboardOwner()->i != SDL_Window );
 
 #elif defined(QNX_SCRAP)
 /* * */

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
Warzone-dev mailing list
Warzone-dev@gna.org
https://mail.gna.org/listinfo/warzone-dev

Reply via email to