зеркало из https://github.com/mozilla/gecko-dev.git
Move xpcom specific defines from mozilla-config.h into xpcom-config.h.
Bug #210409 r=dougt
This commit is contained in:
Родитель
524a20845d
Коммит
cab1558f57
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
38
configure.in
38
configure.in
|
@ -1866,7 +1866,10 @@ case $target in
|
||||||
*-darwin*)
|
*-darwin*)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
AC_CHECK_LIB(dl, dlopen)
|
AC_CHECK_LIB(dl, dlopen,
|
||||||
|
AC_CHECK_HEADER(dlfcn.h,
|
||||||
|
LIBS="-ldl $LIBS"
|
||||||
|
AC_DEFINE(HAVE_LIBDL)))
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
if test ! "$GNU_CXX"; then
|
if test ! "$GNU_CXX"; then
|
||||||
|
@ -2208,7 +2211,7 @@ dnl ========================================================
|
||||||
AC_PROG_GCC_TRADITIONAL
|
AC_PROG_GCC_TRADITIONAL
|
||||||
AC_FUNC_MEMCMP
|
AC_FUNC_MEMCMP
|
||||||
AC_CHECK_FUNCS(random strerror lchown fchmod snprintf statvfs memmove rint)
|
AC_CHECK_FUNCS(random strerror lchown fchmod snprintf statvfs memmove rint)
|
||||||
AC_CHECK_FUNCS(nl_langinfo flockfile)
|
AC_CHECK_FUNCS(nl_langinfo flockfile getpagesize)
|
||||||
|
|
||||||
dnl localtime_r and strtok_r are only present on MacOS version 10.2 and higher
|
dnl localtime_r and strtok_r are only present on MacOS version 10.2 and higher
|
||||||
if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "100200"; then
|
if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "100200"; then
|
||||||
|
@ -5266,7 +5269,36 @@ AC_SUBST(ac_configure_args)
|
||||||
dnl Spit out some output
|
dnl Spit out some output
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
|
|
||||||
AC_CONFIG_HEADER(gfx/gfx-config.h netwerk/necko-config.h)
|
dnl The following defines are used by xpcom
|
||||||
|
_NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES
|
||||||
|
CPP_THROW_NEW
|
||||||
|
HAVE_CPP_2BYTE_WCHAR_T
|
||||||
|
HAVE_CPP_ACCESS_CHANGING_USING
|
||||||
|
HAVE_CPP_AMBIGUITY_RESOLVING_USING
|
||||||
|
HAVE_CPP_BOOL
|
||||||
|
HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR
|
||||||
|
HAVE_CPP_EXPLICIT
|
||||||
|
HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
|
||||||
|
HAVE_CPP_NAMESPACE_STD
|
||||||
|
HAVE_CPP_NEW_CASTS
|
||||||
|
HAVE_CPP_PARTIAL_SPECIALIZATION
|
||||||
|
HAVE_CPP_TROUBLE_COMPARING_TO_ZERO
|
||||||
|
HAVE_CPP_TYPENAME
|
||||||
|
HAVE_CPP_UNAMBIGUOUS_STD_NOTEQUAL
|
||||||
|
HAVE_STATVFS
|
||||||
|
NEED_CPP_UNUSED_IMPLEMENTATIONS
|
||||||
|
NEW_H
|
||||||
|
HAVE_64BIT_OS
|
||||||
|
HAVE_GETPAGESIZE
|
||||||
|
HAVE_ICONV
|
||||||
|
HAVE_ICONV_WITH_CONST_INPUT
|
||||||
|
HAVE_MBRTOWC
|
||||||
|
HAVE_SYS_MOUNT_H
|
||||||
|
HAVE_SYS_VFS_H
|
||||||
|
HAVE_WCRTOMB
|
||||||
|
"
|
||||||
|
|
||||||
|
AC_CONFIG_HEADER(gfx/gfx-config.h netwerk/necko-config.h xpcom/xpcom-config.h)
|
||||||
|
|
||||||
# Save the defines header file before autoconf removes it.
|
# Save the defines header file before autoconf removes it.
|
||||||
# (Do not add AC_DEFINE calls after this line.)
|
# (Do not add AC_DEFINE calls after this line.)
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
*
|
*
|
||||||
* ***** END LICENSE BLOCK ***** */
|
* ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
|
#include "xpcom-config.h"
|
||||||
#include NEW_H // for placement new
|
#include NEW_H // for placement new
|
||||||
#include "nscore.h"
|
#include "nscore.h"
|
||||||
#include "nsCRT.h"
|
#include "nsCRT.h"
|
||||||
|
|
|
@ -61,6 +61,7 @@
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "xpcom-config.h"
|
||||||
#include NEW_H
|
#include NEW_H
|
||||||
#include "nsCOMPtr.h"
|
#include "nsCOMPtr.h"
|
||||||
#include "nsIComponentManager.h"
|
#include "nsIComponentManager.h"
|
||||||
|
|
|
@ -26,6 +26,7 @@ VPATH = @srcdir@
|
||||||
|
|
||||||
include $(DEPTH)/config/autoconf.mk
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
|
MODULE = xpcom
|
||||||
GRE_MODULE = 1
|
GRE_MODULE = 1
|
||||||
|
|
||||||
DIRS = \
|
DIRS = \
|
||||||
|
@ -58,5 +59,8 @@ DIRS += \
|
||||||
proxy/tests
|
proxy/tests
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# xpcom-config.h is generated by configure
|
||||||
|
SDK_HEADERS = xpcom-config.h
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
|
|
|
@ -40,10 +40,9 @@
|
||||||
/**
|
/**
|
||||||
* Make sure that we have the proper platform specific
|
* Make sure that we have the proper platform specific
|
||||||
* c++ definitions needed by nscore.h
|
* c++ definitions needed by nscore.h
|
||||||
* Add ifdef to speed up compliation but mozilla-config.h is still required
|
|
||||||
*/
|
*/
|
||||||
#ifndef _MOZILLA_CONFIG_H_
|
#ifndef _XPCOM_CONFIG_H_
|
||||||
#include "mozilla-config.h"
|
#include "xpcom-config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -0,0 +1,96 @@
|
||||||
|
/* Global defines needed by xpcom clients */
|
||||||
|
|
||||||
|
#ifndef _XPCOM_CONFIG_H_
|
||||||
|
#define _XPCOM_CONFIG_H_
|
||||||
|
|
||||||
|
/* Define this to throw() if the compiler complains about
|
||||||
|
* constructors returning NULL
|
||||||
|
*/
|
||||||
|
#undef CPP_THROW_NEW
|
||||||
|
|
||||||
|
/* Define if the c++ compiler supports a 2-byte wchar_t */
|
||||||
|
#undef HAVE_CPP_2BYTE_WCHAR_T
|
||||||
|
|
||||||
|
/* Define if the c++ compiler supports changing access with |using| */
|
||||||
|
#undef HAVE_CPP_ACCESS_CHANGING_USING
|
||||||
|
|
||||||
|
/* Define if the c++ compiler can resolve ambiguity with |using| */
|
||||||
|
#undef HAVE_CPP_AMBIGUITY_RESOLVING_USING
|
||||||
|
|
||||||
|
/* Define if the c++ compiler has builtin Bool type */
|
||||||
|
#undef HAVE_CPP_BOOL
|
||||||
|
|
||||||
|
/* Define if a dyanmic_cast to void* gives the most derived object */
|
||||||
|
#undef HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR
|
||||||
|
|
||||||
|
/* Define if the c++ compiler supports the |explicit| keyword */
|
||||||
|
#undef HAVE_CPP_EXPLICIT
|
||||||
|
|
||||||
|
/* Define if the c++ compiler supports the modern template
|
||||||
|
* specialization syntax
|
||||||
|
*/
|
||||||
|
#undef HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
|
||||||
|
|
||||||
|
/* Define if the c++ compiler supports the |std| namespace */
|
||||||
|
#undef HAVE_CPP_NAMESPACE_STD
|
||||||
|
|
||||||
|
/* Define if the c++ compiler supports reinterpret_cast */
|
||||||
|
#undef HAVE_CPP_NEW_CASTS
|
||||||
|
|
||||||
|
/* Define if the c++ compiler supports partial template specialization */
|
||||||
|
#undef HAVE_CPP_PARTIAL_SPECIALIZATION
|
||||||
|
|
||||||
|
/* Define if the c++ compiler has trouble comparing a constant
|
||||||
|
* reference to a templatized class to zero
|
||||||
|
*/
|
||||||
|
#undef HAVE_CPP_TROUBLE_COMPARING_TO_ZERO
|
||||||
|
|
||||||
|
/* Define if the c++ compiler supports the |typename| keyword */
|
||||||
|
#undef HAVE_CPP_TYPENAME
|
||||||
|
|
||||||
|
/* Define if the stanard template operator!=() is ambiguous */
|
||||||
|
#undef HAVE_CPP_UNAMBIGUOUS_STD_NOTEQUAL
|
||||||
|
|
||||||
|
/* Define if statvfs() is available */
|
||||||
|
#undef HAVE_STATVFS
|
||||||
|
|
||||||
|
/* Define if the c++ compiler requires implementations of
|
||||||
|
* unused virtual methods
|
||||||
|
*/
|
||||||
|
#undef NEED_CPP_UNUSED_IMPLEMENTATIONS
|
||||||
|
|
||||||
|
/* Define to either <new> or <new.h> */
|
||||||
|
#undef NEW_H
|
||||||
|
|
||||||
|
/* The following defines are only used by the xpcom implementation */
|
||||||
|
|
||||||
|
#ifdef _IMPL_NS_COM
|
||||||
|
|
||||||
|
/* Define if compiling for a 64-bit operating system */
|
||||||
|
#undef HAVE_64BIT_OS
|
||||||
|
|
||||||
|
/* Define if getpagesize() is available */
|
||||||
|
#undef HAVE_GETPAGESIZE
|
||||||
|
|
||||||
|
/* Define if iconv() is available */
|
||||||
|
#undef HAVE_ICONV
|
||||||
|
|
||||||
|
/* Define if iconv() supports const input */
|
||||||
|
#undef HAVE_ICONV_WITH_CONST_INPUT
|
||||||
|
|
||||||
|
/* Define if mbrtowc() is available */
|
||||||
|
#undef HAVE_MBRTOWC
|
||||||
|
|
||||||
|
/* Define if <sys/mount.h> is present */
|
||||||
|
#undef HAVE_SYS_MOUNT_H
|
||||||
|
|
||||||
|
/* Define if <sys/vfs.h> is present */
|
||||||
|
#undef HAVE_SYS_VFS_H
|
||||||
|
|
||||||
|
/* Define if wcrtomb() is available */
|
||||||
|
#undef HAVE_WCRTOMB
|
||||||
|
|
||||||
|
#endif /* _IMPL_NS_COM */
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* _XPCOM_CONFIG_H_ */
|
Загрузка…
Ссылка в новой задаче