Bug 712034 - Clean up jstypes.h a bit; r=njn

This commit is contained in:
Ms2ger 2012-01-15 09:13:12 +01:00
parent d236ac43e7
commit c7c024b493

View File

@ -54,6 +54,7 @@
#ifndef jstypes_h___
#define jstypes_h___
#include "mozilla/Attributes.h"
#include "mozilla/Util.h"
#include "js-config.h"
@ -116,37 +117,15 @@
#endif
#ifndef JS_INLINE
# if defined __cplusplus
# define JS_INLINE inline
# elif defined _MSC_VER
# define JS_INLINE __inline
# elif defined __GNUC__
# define JS_INLINE __inline__
# else
# define JS_INLINE inline
# endif
#define JS_INLINE MOZ_INLINE
#endif
#ifndef JS_ALWAYS_INLINE
# if defined DEBUG
# define JS_ALWAYS_INLINE JS_INLINE
# elif defined _MSC_VER
# define JS_ALWAYS_INLINE __forceinline
# elif defined __GNUC__
# define JS_ALWAYS_INLINE __attribute__((always_inline)) JS_INLINE
# else
# define JS_ALWAYS_INLINE JS_INLINE
# endif
#define JS_ALWAYS_INLINE MOZ_ALWAYS_INLINE
#endif
#ifndef JS_NEVER_INLINE
# if defined _MSC_VER
# define JS_NEVER_INLINE __declspec(noinline)
# elif defined __GNUC__
# define JS_NEVER_INLINE __attribute__((noinline))
# else
# define JS_NEVER_INLINE
# endif
#define JS_NEVER_INLINE MOZ_NEVER_INLINE
#endif
#ifndef JS_WARN_UNUSED_RESULT
@ -253,29 +232,6 @@ JS_BEGIN_EXTERN_C
typedef int JSIntn;
typedef unsigned int JSUintn;
/************************************************************************
** TYPES: JSSize
** DESCRIPTION:
** A type for representing the size of objects.
************************************************************************/
typedef size_t JSSize;
/************************************************************************
** TYPES: JSPtrDiff
** DESCRIPTION:
** A type for pointer difference. Variables of this type are suitable
** for storing a pointer or pointer sutraction.
************************************************************************/
typedef ptrdiff_t JSPtrdiff;
/************************************************************************
** TYPES: JSUptrdiff
** DESCRIPTION:
** A type for pointer difference. Variables of this type are suitable
** for storing a pointer or pointer sutraction.
************************************************************************/
typedef uintptr_t JSUptrdiff;
/************************************************************************
** TYPES: JSBool
** DESCRIPTION: