зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1251769 - Remove remaining references to MOZILLA_XPCOMRT_API from mfbt. r=froydnj
This commit is contained in:
Родитель
e9c93e58a3
Коммит
c47a83ce36
|
@ -158,7 +158,7 @@ MOZ_ReportAssertionFailure(const char* aStr, const char* aFilename, int aLine)
|
||||||
aStr, aFilename, aLine);
|
aStr, aFilename, aLine);
|
||||||
#else
|
#else
|
||||||
fprintf(stderr, "Assertion failure: %s, at %s:%d\n", aStr, aFilename, aLine);
|
fprintf(stderr, "Assertion failure: %s, at %s:%d\n", aStr, aFilename, aLine);
|
||||||
#if defined (MOZ_DUMP_ASSERTION_STACK) && !defined(MOZILLA_XPCOMRT_API)
|
#if defined (MOZ_DUMP_ASSERTION_STACK)
|
||||||
nsTraceRefcnt::WalkTheStack(stderr);
|
nsTraceRefcnt::WalkTheStack(stderr);
|
||||||
#endif
|
#endif
|
||||||
fflush(stderr);
|
fflush(stderr);
|
||||||
|
@ -174,7 +174,7 @@ MOZ_ReportCrash(const char* aStr, const char* aFilename, int aLine)
|
||||||
"Hit MOZ_CRASH(%s) at %s:%d\n", aStr, aFilename, aLine);
|
"Hit MOZ_CRASH(%s) at %s:%d\n", aStr, aFilename, aLine);
|
||||||
#else
|
#else
|
||||||
fprintf(stderr, "Hit MOZ_CRASH(%s) at %s:%d\n", aStr, aFilename, aLine);
|
fprintf(stderr, "Hit MOZ_CRASH(%s) at %s:%d\n", aStr, aFilename, aLine);
|
||||||
#if defined(MOZ_DUMP_ASSERTION_STACK) && !defined(MOZILLA_XPCOMRT_API)
|
#if defined(MOZ_DUMP_ASSERTION_STACK)
|
||||||
nsTraceRefcnt::WalkTheStack(stderr);
|
nsTraceRefcnt::WalkTheStack(stderr);
|
||||||
#endif
|
#endif
|
||||||
fflush(stderr);
|
fflush(stderr);
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(MOZILLA_INTERNAL_API) && \
|
#if defined(MOZILLA_INTERNAL_API) && \
|
||||||
!defined(MOZILLA_XPCOMRT_API) && \
|
|
||||||
(defined(DEBUG) || defined(FORCE_BUILD_REFCNT_LOGGING))
|
(defined(DEBUG) || defined(FORCE_BUILD_REFCNT_LOGGING))
|
||||||
#define MOZ_REFCOUNTED_LEAK_CHECKING
|
#define MOZ_REFCOUNTED_LEAK_CHECKING
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -89,7 +89,7 @@
|
||||||
* symbols. We add the weak attribute to the import version of the MFBT API
|
* symbols. We add the weak attribute to the import version of the MFBT API
|
||||||
* macros to exploit this.
|
* macros to exploit this.
|
||||||
*/
|
*/
|
||||||
# if defined(MOZ_GLUE_IN_PROGRAM) && !defined(MOZILLA_XPCOMRT_API)
|
# if defined(MOZ_GLUE_IN_PROGRAM)
|
||||||
# define MFBT_API __attribute__((weak)) MOZ_IMPORT_API
|
# define MFBT_API __attribute__((weak)) MOZ_IMPORT_API
|
||||||
# define MFBT_DATA __attribute__((weak)) MOZ_IMPORT_DATA
|
# define MFBT_DATA __attribute__((weak)) MOZ_IMPORT_DATA
|
||||||
# else
|
# else
|
||||||
|
|
Загрузка…
Ссылка в новой задаче