Closed Bug 835738 Opened 9 years ago Closed 9 years ago

Use GUID_PROP_INPUTSCOPE declaration from inputscope.h

Categories

(Core :: Widget: Win32, defect)

x86
Windows 7
defect
Not set
normal

Tracking

()

RESOLVED FIXED
mozilla21

People

(Reporter: jacek, Assigned: jacek)

Details

Attachments

(1 file)

Attached patch fix v1.0Splinter Review
I looked at this because recent changes broke mingw compilation. That's because, after preprocessing, we get something like this:

// inputscope.h
extern "C" const GUID GUID_PROP_INPUTSCOPE;
// nsTextStore.cpp
static const GUID GUID_PROP_INPUTSCOPE = {...};

So there is conflict between extern and static declaration, which is not allowed in GCC (I confirmed that MSVC allows such mix). I could just make GUID_PROP_INPUTSCOPE non-static, but instead we can make things a bit cleaner and avoid hardcoding GUID_PROP_INPUTSCOPE. It is defined in inputscope.h using INIT_GUID. We may just include initguid.h before inputscope.h to get the needed declaration.
Attachment #707514 - Flags: review?(jmathies)
I forgot to mention that the patch is green on try:
https://tbpl.mozilla.org/?tree=Try&rev=0d30dc77f899
Do you have any idea how far back GUID_PROP_INPUTSCOPE is defined? We should support the vs2005 sdks out of the box by default.

https://developer.mozilla.org/en-US/docs/Developer_Guide/Build_Instructions/Windows_Prerequisites
I checked in vs2005 installation and GUID_PROP_INPUTSCOPE declaration is present there.
Attachment #707514 - Flags: review?(jmathies) → review+
https://hg.mozilla.org/mozilla-central/rev/bfe496ca5c40
Status: NEW → RESOLVED
Closed: 9 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla21
You need to log in before you can comment on or make changes to this bug.