971822 - Fix string_util.h combined with strsafe.h on mingw.

Status: RESOLVED FIXED

(Core :: IPC, defect)

Description

[Jacek Caban]

Attachment: fix

The problem is visible in TaskbarPreviewButton.cpp compilation on mingw. That file uses strsafe.h, which is PSDK header that provides a few "safe" versions of string APIs. It also deprecates some of standard string APIs. This deprecations have two forms:
- if #pragma deprecate is supported, it is used
- otherwise use something like #define swprintf swprintf_instead_use_StringCbPrintfW_or_StringCchPrintfW;
Since GCC doesn't support this pragma, the define is used. That's problematic for string_util.h, which has its own versions of snprintf and swprintf inside a namespace. The mentioned define makes it fail. The attached patch simply #undefs required identifiers.

Comment 1

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Comment on attachment 8374945 [details] [diff] [review]
fix

Maybe glandium feels more comfortable reviewing this?

Comment 2

[Mike Hommey [:glandium]]

Can you tell what this is fixing? At quick glance, I don't see what those #defines would be breaking. The functions are inline, and the define will replace the names in both the definition and the callers.

Comment 3

[Jacek Caban]

Note that ';' is part of the define. If it wasn't then yes, that would work.

For the reference:
http://repo.or.cz/w/mingw-w64/jacek.git/blob/32259b968875d907252f4f754d696aae114d8434:/mingw-w64-headers/include/strsafe.h#l1944

Comment 4

[Mike Hommey [:glandium]]

Comment on attachment 8374945 [details] [diff] [review]
fix

Review of attachment 8374945 [details] [diff] [review]:
-----------------------------------------------------------------

Seems like we just ought to define STRSAFE_NO_DEPRECATE.

Comment 5

[Jacek Caban]

Attachment: define STRSAFE_NO_DEPRECATE

Comment 6

[Mike Hommey [:glandium]]

Comment on attachment 8378296 [details] [diff] [review]
define STRSAFE_NO_DEPRECATE

Review of attachment 8378296 [details] [diff] [review]:
-----------------------------------------------------------------

::: widget/windows/TaskbarPreviewButton.cpp
@@ +4,5 @@
>   * This Source Code Form is subject to the terms of the Mozilla Public
>   * License, v. 2.0. If a copy of the MPL was not distributed with this
>   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
>  
> +#define STRSAFE_NO_DEPRECATE

I think you should just AC_DEFINE it in configure for mingw builds.

Comment 7

[Jacek Caban]

Attachment: fix

Comment 8

[Mike Hommey [:glandium]]

Comment on attachment 8378881 [details] [diff] [review]
fix

Review of attachment 8378881 [details] [diff] [review]:
-----------------------------------------------------------------

::: configure.in
@@ +643,5 @@
>                  ;;
>              esac
>          fi
>  
> +        # strsafe.h on mingw uses macros for function deprecation that polutes namespace

pollutes

Comment 9

[Jacek Caban]

Thanks for reviews.

https://hg.mozilla.org/integration/mozilla-inbound/rev/5cfcff375329

Comment 10

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/5cfcff375329