mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-03-03 15:26:07 +00:00
Bug 792379 - Don't include prtypes.h in base/basictypes.h; r=cjones
This commit is contained in:
parent
388bca7c1d
commit
b138fe0e97
@ -12,18 +12,6 @@
|
||||
#error You_must_include_basictypes.h_before_prtypes.h!
|
||||
#endif
|
||||
|
||||
#ifndef NO_NSPR_10_SUPPORT
|
||||
#define NO_NSPR_10_SUPPORT
|
||||
#define NO_NSPR_10_SUPPORT_SAVE
|
||||
#endif
|
||||
|
||||
#include "prtypes.h"
|
||||
|
||||
#ifdef NO_NSPR_10_SUPPORT_SAVE
|
||||
#undef NO_NSPR_10_SUPPORT_SAVE
|
||||
#undef NO_NSPR_10_SUPPORT
|
||||
#endif
|
||||
|
||||
#include <limits.h> // So we can set the bounds of our types
|
||||
#include <stddef.h> // For size_t
|
||||
#include <string.h> // for memcpy
|
||||
|
@ -16,24 +16,24 @@
|
||||
NS_LogRelease((_p), (_rc), (_type))
|
||||
|
||||
#define MOZ_COUNT_CTOR(_type) \
|
||||
PR_BEGIN_MACRO \
|
||||
do { \
|
||||
NS_LogCtor((void*)this, #_type, sizeof(*this)); \
|
||||
PR_END_MACRO
|
||||
} while (0)
|
||||
|
||||
#define MOZ_COUNT_CTOR_INHERITED(_type, _base) \
|
||||
PR_BEGIN_MACRO \
|
||||
do { \
|
||||
NS_LogCtor((void*)this, #_type, sizeof(*this) - sizeof(_base)); \
|
||||
PR_END_MACRO
|
||||
} while (0)
|
||||
|
||||
#define MOZ_COUNT_DTOR(_type) \
|
||||
PR_BEGIN_MACRO \
|
||||
do { \
|
||||
NS_LogDtor((void*)this, #_type, sizeof(*this)); \
|
||||
PR_END_MACRO
|
||||
} while (0)
|
||||
|
||||
#define MOZ_COUNT_DTOR_INHERITED(_type, _base) \
|
||||
PR_BEGIN_MACRO \
|
||||
do { \
|
||||
NS_LogDtor((void*)this, #_type, sizeof(*this) - sizeof(_base)); \
|
||||
PR_END_MACRO
|
||||
} while (0)
|
||||
|
||||
/* nsCOMPtr.h allows these macros to be defined by clients
|
||||
* These logging functions require dynamic_cast<void*>, so they don't
|
||||
|
@ -10,6 +10,7 @@
|
||||
*
|
||||
* Try to keep this file in sync with js/src/jsdhash.h.
|
||||
*/
|
||||
#include "mozilla/Types.h"
|
||||
#include "nscore.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
Loading…
x
Reference in New Issue
Block a user