Bug 34614

Summary: [Qt] npapi header leaves XP_WIN flag defined even when __SYMBIAN32__ flag is found
Product: WebKit Reporter: Abhinav Mithal <abhinav.mithal>
Component: PlatformAssignee: Abhinav Mithal <abhinav.mithal>
Status: CLOSED FIXED    
Severity: Normal CC: abhinav.mithal, commit-queue, hausmann, hegde.shashank, laszlo.gombos
Priority: P2 Keywords: Qt
Version: 528+ (Nightly build)   
Hardware: S60 Emulator   
OS: S60 3rd edition   
Bug Depends on:    
Bug Blocks: 35784    
Attachments:
Description Flags
This patch checks for Symbian flag definition before defining XP_WIN flag and takes care of the issue.
none
This is a new patch which has been tested for both winscw and armv5 none

Abhinav Mithal
Reported 2010-02-04 13:27:09 PST
When MinGW compiler is used to compile Netscape Plugins on Windows XP with Qt, npapi.h tries to include windows.h. This is because in npapi.h ifdef clause for __SYMBIAN32__ does not undefine XP_WIN and npapi.h eventually ends up trying to include windows.h eventhough user is building for Symbian. This problem is reproducible with nightly build -r54342 Here is the error seen while trying to compile a sample Netscape Plug-in: make -s -r -f "\EPOC32\BUILD\cwrt\plugins\s60\SampleNPQtPlugin\SAMPLENPQTPLUGIN_0XE0AE5E3D\WINSCW\SAMPLENPQTPLUGIN_0XE0AE5E3D.WINSCW" UDEB samplenpqtplugin.cpp npapi.h:116: the file 'windows.h' cannot be opened Proposed Solution: add #undef XP_WIN after #define XP_SYMBIAN 1 in the ifdef clause for __SYMBIAN32__
Attachments
This patch checks for Symbian flag definition before defining XP_WIN flag and takes care of the issue. (1.33 KB, patch)
2010-04-06 07:55 PDT, Abhinav Mithal 		no flags
DetailsFormatted DiffDiff
This is a new patch which has been tested for both winscw and armv5 (1.03 KB, patch)
2010-04-06 11:28 PDT, Abhinav Mithal 		no flags
DetailsFormatted DiffDiff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.
Laszlo Gombos
Comment 1 2010-04-05 16:36:17 PDT
Abhinav, any update on this ?
Abhinav Mithal
Comment 2 2010-04-06 07:55:36 PDT
Created attachment 52639 [details] This patch checks for Symbian flag definition before defining XP_WIN flag and takes care of the issue.
Abhinav Mithal
Comment 3 2010-04-06 11:28:26 PDT
Created attachment 52653 [details] This is a new patch which has been tested for both winscw and armv5
Laszlo Gombos
Comment 4 2010-04-06 11:42:21 PDT
Comment on attachment 52653 [details] This is a new patch which has been tested for both winscw and armv5 lgtm, thanks. This seems to be a regression after r49987.
WebKit Commit Bot
Comment 5 2010-04-06 15:32:48 PDT
Comment on attachment 52653 [details] This is a new patch which has been tested for both winscw and armv5 Clearing flags on attachment: 52653 Committed r57170: <http://trac.webkit.org/changeset/57170>
WebKit Commit Bot
Comment 6 2010-04-06 15:32:53 PDT
All reviewed patches have been landed. Closing bug.
Simon Hausmann
Comment 7 2010-04-07 00:32:38 PDT
Revision r57170 cherry-picked into qtwebkit-2.0 with commit b246edd8056941a91f1ceec2fcd45850d647ef34
Simon Hausmann
Comment 8 2010-06-16 06:33:47 PDT
*** Bug 39708 has been marked as a duplicate of this bug. ***
Simon Hausmann
Comment 9 2010-06-16 08:55:44 PDT
Revision r57170 cherry-picked into qtwebkit-4.6 with aa3f786bdba4dc153620ae7f98e4b0e41770d1d1
Note You need to log in before you can comment on or make changes to this bug.