[Patch] two patches to compile kdelibs/khtml on windows

[Christian Ehrlicher]

Lubos Lunak schrieb:
> Dne pondělí 05 prosinec 2005 21:59 Christian Ehrlicher napsal(a):
> 
>>Maks Orlovich schrieb:
>><snip>
>>
>>>>The scond is a little bit more complicated.
>>>>The win32 api sdk also defines some values (OPTIONAL, ABSOLUTE, RELATIVE
>>>>and FOCUS_EVENT) and therefore I get compiler errors when an api-header
>>>>is included somewhere. So I decided to undef those values in the
>>>>specific headers before they get redefined. I have to include windows.h
>>>>too to be sure it isn't included after the definition of the problematic
>>>>enums.
>>>
>>>Could you perhaps consider doing something like "fixwin32h.h", similar to
>>>the "fixx11h.h", so all the ugliness is localized?
>>
>>I think this is a good idea but I don't understand why this file
>>shouldn't be included into a header ("... put #include <fixx11h.h> in
>>the .cpp file (not .h file!) between the place where X11 headers...").
>>I have to put fixwinh.h into a header because I get the errors there...
>>Also I have to include windows.h because of the reason above.
> 
> 
>  The reason is that fixx11h.h alters what's included from previous files and 
> so including it from a .h file could affect files where you don't expect 
> this. And from looking at your patch I don't see why DOM headers should 
> include platform-specific .h files, you should include platform-specific 
> headers in platform-specific .cpp files.
> 
>  That said, since fixx11h.h says it should be without side effects, including 
> such files from headers shouldn't be probably a problem if you really have a 
> good reason to do so.
Here the fixwinh.h and a patch to include it in the three headers where
I get compile errors. It should not affect compilation on linux.

What about the other patch? Is it ok (with the change from Thiago Macieira)?

Christian
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: fixwinh.h
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20051206/714718bc/attachment.h>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: khtml_fixwinh.patch
Type: text/x-diff
Size: 1000 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20051206/714718bc/attachment.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 250 bytes
Desc: OpenPGP digital signature
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20051206/714718bc/attachment.sig>