Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1585373 - Re-enable PoisonIOInterposer for the mingw build r=dmajor

Browse Source 
This was disabled in Bug 1441558 because it broke the mingw-gcc build.
But it doesn't break the mingw-clang build, and we don't support mingw-gcc
anymore, so we can re-enable it.

Differential Revision: https://phabricator.services.mozilla.com/D48645

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Tom Ritter 2019-10-09 14:53:36 +00:00
parent 2f74e2ef0e
commit ff95dca4e6
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xpcom/build/PoisonIOInterposer.h
View File

@ -37,7 +37,7 @@ void MozillaUnRegisterDebugFILE(FILE* aFile);
MOZ_END_EXTERN_C
#if defined(XP_MACOSX) || (defined(XP_WIN) && !defined(__MINGW32__))
#if defined(XP_MACOSX) || defined(XP_WIN)
# ifdef __cplusplus
namespace mozilla {
@ -74,7 +74,7 @@ void ClearPoisonIOInterposer();
} // namespace mozilla
# endif /* __cplusplus */
#else /* defined(XP_MACOSX) || (defined(XP_WIN) && !defined(__MINGW32__)) */
#else /* defined(XP_MACOSX) || defined(XP_WIN) */
# ifdef __cplusplus
namespace mozilla {

13
xpcom/build/moz.build
View File

@ -30,14 +30,11 @@ if CONFIG['OS_ARCH'] == 'WINNT':
EXPORTS.mozilla += [
'perfprobe.h',
]
SOURCES += ['perfprobe.cpp']
if CONFIG['CC_TYPE'] not in ('gcc', 'clang'):
SOURCES += [
'PoisonIOInterposerBase.cpp',
'PoisonIOInterposerWin.cpp',
]
else:
SOURCES += ['PoisonIOInterposerStub.cpp']
SOURCES += [
'perfprobe.cpp',
'PoisonIOInterposerBase.cpp',
'PoisonIOInterposerWin.cpp',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
UNIFIED_SOURCES += [
'PoisonIOInterposerBase.cpp',