зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1585373 - Re-enable PoisonIOInterposer for the mingw build r=dmajor
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:
Родитель
2f74e2ef0e
Коммит
ff95dca4e6
|
@ -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 {
|
||||
|
|
|
@ -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',
|
||||
|
|
Загрузка…
Ссылка в новой задаче