835738 - Use GUID_PROP_INPUTSCOPE declaration from inputscope.h

Status: RESOLVED FIXED

(Core :: Widget: Win32, defect)

Description

[Jacek Caban]

Attachment: fix v1.0

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.

Comment 1

[Jacek Caban]

I forgot to mention that the patch is green on try:
https://tbpl.mozilla.org/?tree=Try&rev=0d30dc77f899

Comment 2

[Jim Mathies [:jimm]]

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

Comment 3

[Jacek Caban]

I checked in vs2005 installation and GUID_PROP_INPUTSCOPE declaration is present there.

Comment 4

[Jacek Caban]

Thanks for review.

https://hg.mozilla.org/integration/mozilla-inbound/rev/bfe496ca5c40

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/bfe496ca5c40