Bugzilla Bug 213872

When attempting to compile the latest games-strategy/scorched3d-41.3-r1 on an
amd64 system (at least with mysql use flag enabled), the compilation will end
as follows:

/usr/include/sqltypes.h:71: error: conflicting declaration 'typedef void* HWND'
../porting/windows.h:23: error: 'HWND' has a previous declaration as 'typedef
int HWND'
x86_64-pc-linux-gnu-g++ -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\"
-DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\"
-DPACKAGE=\"scorched3d\" -DVERSION=\"41\" -DHAVE_OGG=1 -DHAVE_VSNPRINTF=1
-DHAVE_SNPRINTF=1 -DHAVE_VASPRINTF=1 -DHAVE_ASPRINTF=1 -DHAVE_ICONV=1
-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1
-DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1
-DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_UNISTD_H=1 -DHAVE_ICONV_H=1 -I. 
-I../porting -I.. -I/usr/lib64/wx/include/gtk2-unicode-release-2.8
-I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_IODBC_
-D__WXGTK__ -pthread -I/usr/include/freetype2 -I/usr/include/SDL
-D_GNU_SOURCE=1 -D_REENTRANT -I/usr/X11R6/include -I/usr/X11R6
-I/usr/local/include  -O2 -march=k8 -fomit-frame-pointer -pipe
-DS3D_DOCDIR=\"/usr/share/doc/scorched3d-41.3-r1\"
-DS3D_DATADIR=\"/usr/share/games/scorched3d\" -DS3D_BINDIR=\"/usr/games/bin\"
-c -o ModFiles.o `test -f '../engine/ModFiles.cpp' || echo
'./'`../engine/ModFiles.cpp

It appears to be due to a rogue and unnecessary (on non-Windows systems) HWND
declaration in windows.h. I'll attach a minimal patch below, which fixes the
issue.

Created an attachment (id=146534) [details]
scorched3d-41.3-no-windows-hwnd.patch Removes the HWND declaration

Removes the excess HWND declaration which blocks compilation on amd64 with
mysql flag enabled.

Created an attachment (id=146535) [details]
scorched3d-41.3-r2.ebuild which applies the patch

Upgraded ebuild from scorched-41.3-r1 to -r2, with changes which apply the
patch.

Fixed, thanks.