Bug 808399 - Remove build support for BeOS and VMS r=callek
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,15 +82,15 @@ buildsymbols :: $(SUBMAKEFILES)
$(MAKE) -C mozilla MAKE_SYM_STORE_PATH=$(MAKE_SYM_STORE_PATH) SYM_STORE_SOURCE_DIRS="$(topsrcdir)/mozilla/extensions/inspector $(topsrcdir)/ldap/sdks $(topsrcdir)/mozilla $(topsrcdir)" $@
include $(topsrcdir)/config/rules.mk
# defined in (mozilla/.../)package-name.mk
export MOZ_SOURCE_STAMP
DIST_GARBAGE = config.cache config.log config.status config-defs.h \
- dependencies.beos config/autoconf.mk \
+ config/autoconf.mk \
unallmakefiles comm-config.h \
$(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
distclean::
cat unallmakefiles | $(XARGS) rm -f
rm -f $(DIST_GARBAGE)
--- a/config/config.mk
+++ b/config/config.mk
@@ -74,20 +74,16 @@ BUILD_TOOLS = $(WIN_TOP_SRC)/mozilla
else
win_srcdir := $(srcdir)
BUILD_TOOLS = $(MOZILLA_SRCDIR)/build/unix
endif
CONFIG_TOOLS = $(MOZ_BUILD_ROOT)/mozilla/config
AUTOCONF_TOOLS = $(MOZILLA_SRCDIR)/build/autoconf
-ifeq ($(OS_ARCH),BeOS)
-BEOS_ADDON_WORKAROUND = 1
-endif
-
#
# Strip off the excessively long version numbers on these platforms,
# but save the version to allow multiple versions of the same base
# platform to be built in the same tree.
#
ifneq (,$(filter FreeBSD HP-UX Linux NetBSD OpenBSD SunOS,$(OS_ARCH)))
OS_RELEASE := $(basename $(OS_RELEASE))
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -349,33 +349,16 @@ endif
#
# the Solaris WorkShop template repository cache. it occasionally can get
# out of sync, so targets like clobber should kill it.
#
ifeq ($(SOLARIS_SUNPRO_CXX),1)
GARBAGE_DIRS += SunWS_cache
endif
-ifeq ($(OS_ARCH),OpenVMS)
-GARBAGE += $(wildcard *.*_defines)
-ifdef SHARED_LIBRARY
-VMS_SYMVEC_FILE = $(SHARED_LIBRARY:$(DLL_SUFFIX)=_symvec.opt)
-ifdef MOZ_DEBUG
-VMS_SYMVEC_FILE_MODULE = $(MOZILLA_SRCDIR)/build/unix/vms/$(notdir $(SHARED_LIBRARY:$(DLL_SUFFIX)=_dbg_symvec.opt))
-else
-VMS_SYMVEC_FILE_MODULE = $(MOZILLA_SRCDIR)/build/unix/vms/$(notdir $(SHARED_LIBRARY:$(DLL_SUFFIX)=_symvec.opt))
-endif
-VMS_SYMVEC_FILE_COMP = $(MOZILLA_SRCDIR)/build/unix/vms/component_symvec.opt
-GARBAGE += $(VMS_SYMVEC_FILE)
-ifdef IS_COMPONENT
-DSO_LDOPTS := $(filter-out -auto_symvec,$(DSO_LDOPTS)) $(VMS_SYMVEC_FILE)
-endif
-endif
-endif
-
XPIDL_GEN_DIR = _xpidlgen
ifdef MOZ_UPDATE_XTERM
# Its good not to have a newline at the end of the titlebar string because it
# makes the make -s output easier to read. Echo -n does not work on all
# platforms, but we can trick printf into doing it.
UPDATE_TITLE = printf "\033]0;%s in %s\007" $(1) $(shell $(BUILD_TOOLS)/print-depth-path.sh)/$(2) ;
endif
@@ -755,31 +738,25 @@ endif # LIBRARY
ifdef SHARED_LIBRARY
ifdef IS_COMPONENT
$(call install_cmd,$(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components)
$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
ifndef NO_COMPONENTS_MANIFEST
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "manifest components/components.manifest"
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/components.manifest "binary-component $(SHARED_LIBRARY)"
endif
-ifdef BEOS_ADDON_WORKAROUND
- ( cd $(FINAL_TARGET)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
-endif
else # ! IS_COMPONENT
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
ifndef NO_INSTALL_IMPORT_LIBRARY
$(call install_cmd,$(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib)
endif
else
$(call install_cmd,$(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib)
endif
$(call install_cmd,$(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET))
-ifdef BEOS_ADDON_WORKAROUND
- ( cd $(FINAL_TARGET) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
-endif
endif # IS_COMPONENT
endif # SHARED_LIBRARY
ifdef PROGRAM
$(call install_cmd,$(IFLAGS2) $(PROGRAM) $(FINAL_TARGET))
endif
ifdef SIMPLE_PROGRAMS
$(call install_cmd,$(IFLAGS2) $(SIMPLE_PROGRAMS) $(FINAL_TARGET))
endif
@@ -888,22 +865,16 @@ else # !WINNT || GNU_CC
endif # WINNT && !GNU_CC
ifdef ENABLE_STRIP
$(STRIP) $@
endif
ifdef MOZ_POST_PROGRAM_COMMAND
$(MOZ_POST_PROGRAM_COMMAND) $@
endif
-ifeq ($(OS_ARCH),BeOS)
-ifdef BEOS_PROGRAM_RESOURCE
- xres -o $@ $(BEOS_PROGRAM_RESOURCE)
- mimeset $@
-endif
-endif # BeOS
$(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) $(GLOBAL_DEPS)
ifeq (_WINNT,$(GNU_CC)_$(HOST_OS_ARCH))
$(HOST_LD) -NOLOGO -OUT:$@ -PDB:$(HOST_PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
ifdef MSMANIFEST_TOOL
@if test -f $@.manifest; then \
if test -f "$(srcdir)/$@.manifest"; then \
echo "Embedding manifest from $(srcdir)/$@.manifest and $@.manifest"; \
@@ -1023,30 +994,16 @@ endif
# so instead of deleting .o files after repacking them into a dylib, we make
# symlinks back to the originals. The symlinks are a no-op for stabs debugging,
# so no need to conditionalize on OS version or debugging format.
$(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS)
ifndef INCREMENTAL_LINKER
rm -f $@
endif
-ifeq ($(OS_ARCH),OpenVMS)
- @if test ! -f $(VMS_SYMVEC_FILE); then \
- if test -f $(VMS_SYMVEC_FILE_MODULE); then \
- echo Creating specific component options file $(VMS_SYMVEC_FILE); \
- cp $(VMS_SYMVEC_FILE_MODULE) $(VMS_SYMVEC_FILE); \
- fi; \
- fi
-ifdef IS_COMPONENT
- @if test ! -f $(VMS_SYMVEC_FILE); then \
- echo Creating generic component options file $(VMS_SYMVEC_FILE); \
- cp $(VMS_SYMVEC_FILE_COMP) $(VMS_SYMVEC_FILE); \
- fi
-endif
-endif # OpenVMS
ifdef DTRACE_LIB_DEPENDENT
ifndef XP_MACOSX
dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
endif
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(MOZ_GLUE_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
else # ! DTRACE_LIB_DEPENDENT
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(DTRACE_PROBE_OBJ) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(MOZ_GLUE_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
endif # DTRACE_LIB_DEPENDENT
--- a/configure.in
+++ b/configure.in
@@ -985,19 +985,16 @@ solaris*)
fi
fi
AC_SUBST(SOLARIS_SUNPRO_CC)
AC_SUBST(SOLARIS_SUNPRO_CXX)
;;
BSD_386)
HOST_OS_ARCH=BSD
;;
-*OpenVMS*)
- HOST_OS_ARCH=OpenVMS
- ;;
OS_2)
HOST_OS_ARCH=OS2
;;
esac
case "$OS_ARCH" in
WINNT)
if test -z "$CROSS_COMPILE" ; then
@@ -1032,21 +1029,16 @@ MINGW*_NT*)
;;
AIX)
OS_RELEASE=`uname -v`.`uname -r`
OS_TEST=${target_cpu}
;;
BSD_386)
OS_ARCH=BSD
;;
-*OpenVMS*)
- OS_ARCH=OpenVMS
- OS_RELEASE=`uname -v`
- OS_TEST=`uname -p`
- ;;
OS_2)
OS_ARCH=OS2
OS_TARGET=OS2
OS_RELEASE=`uname -v`
;;
Darwin)
case "${target_cpu}" in
i*86*)
@@ -1380,22 +1372,16 @@ MOZ_ARG_ENABLE_BOOL(profiling,
[ --enable-profiling Set compile flags necessary for using sampling profilers (e.g. shark, perf)],
MOZ_PROFILING=1,
MOZ_PROFILING= )
dnl ========================================================
dnl System overrides of the defaults for host
dnl ========================================================
case "$host" in
-*-beos*)
- HOST_CFLAGS="$HOST_CFLAGS -DXP_BEOS -DBeOS -DBEOS -D_POSIX_SOURCE -DNO_X11"
- HOST_NSPR_MDCPUCFG='\"md/_beos.cfg\"'
- HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
- ;;
-
*mingw*)
if test -n "$_WIN32_MSVC"; then
HOST_AR=lib
HOST_AR_FLAGS='-NOLOGO -OUT:"$@"'
HOST_CFLAGS="$HOST_CFLAGS -TC -nologo -Fd\$(HOST_PDBFILE)"
HOST_RANLIB='echo ranlib'
else
HOST_CFLAGS="$HOST_CFLAGS -mno-cygwin"
@@ -1511,34 +1497,16 @@ ld.])
;;
esac
if test "$COMPILE_ENVIRONMENT"; then
AC_CHECK_HEADERS(sys/inttypes.h)
fi
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
;;
-*-beos*)
- no_x=yes
- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
- _PLATFORM_DEFAULT_TOOLKIT="cairo-beos"
- DSO_LDOPTS='-nostart'
- TK_LIBS='-lbe -lroot'
- LIBS="$LIBS -lbe"
- if test "$COMPILE_ENVIRONMENT"; then
- AC_CHECK_LIB(bind,main,LIBS="$LIBS -lbind")
- AC_CHECK_LIB(zeta,main,LIBS="$LIBS -lzeta")
- fi
- _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wno-multichar"
- _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-multichar"
- _MOZ_USE_RTTI=1
- USE_DEPENDENT_LIBS=
- MOZ_USER_DIR="Mozilla"
- ;;
-
*-bsdi*)
dnl -pedantic doesn't play well with BSDI's _very_ modified gcc (shlicc2)
_PEDANTIC=
case $OS_RELEASE in
4.*|5.*)
STRIP="$STRIP -d"
;;
*)
@@ -1911,35 +1879,16 @@ ia64*-hpux*)
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
if test "$LIBRUNPATH"; then
DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
fi
;;
-*-openvms*)
- AC_DEFINE(NO_PW_GECOS)
- AC_DEFINE(NO_UDSOCK)
- AC_DEFINE(POLL_WITH_XCONNECTIONNUMBER)
- USE_PTHREADS=1
- MKSHLIB_FORCE_ALL='-all'
- MKSHLIB_UNFORCE_ALL='-none'
- AS='as'
- AS_DASH_C_FLAG='-Wc/names=as_is'
- AR_FLAGS='c $@'
- DSO_LDOPTS='-shared -auto_symvec'
- DSO_PIC_CFLAGS=
- MOZ_DEBUG_LDFLAGS='-g'
- COMPAQ_CXX=1
- CC_VERSION=`$CC -V 2>&1 | awk '/ C / { print $3 }'`
- CXX_VERSION=`$CXX -V 2>&1 | awk '/ C\+\+ / { print $3 }'`
- ;;
-
-
*-os2*)
MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
AC_DEFINE(OS2)
AC_DEFINE(XP_OS2)
AC_DEFINE(OS2EMX_PLAIN_CHAR)
AC_DEFINE(TCPV40HDRS)
DLL_PREFIX=
@@ -2119,19 +2068,16 @@ if test -z "$MKSHLIB_FORCE_ALL" -o -z "$
fi
case "$target" in
*-os2*)
NO_LD_ARCHIVE_FLAGS=
;;
*-aix4.3*|*-aix5*)
NO_LD_ARCHIVE_FLAGS=
;;
-*-openvms*)
- NO_LD_ARCHIVE_FLAGS=
- ;;
*-mingw*)
if test -z "$GNU_CC"; then
NO_LD_ARCHIVE_FLAGS=
fi
;;
esac
AC_SUBST(NO_LD_ARCHIVE_FLAGS)
@@ -2607,26 +2553,24 @@ case $target in
*-hpux11.*)
;;
*)
AC_CHECK_LIB(c_r, gethostbyname_r)
;;
esac
dnl We don't want to link with libdl even if it's present on OS X, since
-dnl it's not used and not part of the default installation.
-dnl The same goes for BeOS. OS/2 has dlfcn in libc.
+dnl it's not used and not part of the default installation. OS/2 has dlfcn
+dnl in libc.
dnl We don't want to link against libm or libpthread on Darwin since
dnl they both are just symlinks to libSystem and explicitly linking
dnl against libSystem causes issues when debugging (see bug 299601).
case $target in
*-darwin*)
;;
-*-beos*)
- ;;
*-os2*)
;;
*)
AC_CHECK_LIB(m, atan)
AC_CHECK_LIB(dl, dlopen,
AC_CHECK_HEADER(dlfcn.h,
LIBS="-ldl $LIBS"
))
@@ -2948,17 +2892,17 @@ AC_CACHE_CHECK(
)]
)
if test "$ac_cv_func_gnu_get_libc_version" = "yes"; then
AC_DEFINE(HAVE_GNU_GET_LIBC_VERSION)
fi
case $target_os in
- os2*|mingw*|darwin*|beos*)
+ os2*|mingw*|darwin*)
;;
*)
AC_CHECK_LIB(c, iconv, [_ICONV_LIBS="$_ICONV_LIBS"],
AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"],
AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"])))
_SAVE_LIBS=$LIBS
LIBS="$LIBS $_ICONV_LIBS"
@@ -4002,32 +3946,30 @@ MOZ_ARG_HEADER(Toolkit Options)
dnl ========================================================
dnl = Select the default toolkit
dnl ========================================================
MOZ_ARG_ENABLE_STRING(default-toolkit,
[ --enable-default-toolkit=TK
Select default toolkit
Platform specific defaults:
- BeOS - cairo-beos
Mac OS X - cairo-cocoa
OS/2 - cairo-os2
Win32/WinCE - cairo-windows
Gtk2 with DirectFB - cairo-gtk2-dfb
* - cairo-gtk2
* - cairo-qt],
[ _DEFAULT_TOOLKIT=$enableval ],
[ _DEFAULT_TOOLKIT=$_PLATFORM_DEFAULT_TOOLKIT])
if test "$_DEFAULT_TOOLKIT" = "cairo-windows" \
-o "$_DEFAULT_TOOLKIT" = "cairo-gtk2" \
-o "$_DEFAULT_TOOLKIT" = "cairo-gtk2-dfb" \
-o "$_DEFAULT_TOOLKIT" = "cairo-gtk2-x11" \
-o "$_DEFAULT_TOOLKIT" = "cairo-qt" \
- -o "$_DEFAULT_TOOLKIT" = "cairo-beos" \
-o "$_DEFAULT_TOOLKIT" = "cairo-os2" \
-o "$_DEFAULT_TOOLKIT" = "cairo-cocoa"
then
dnl nglayout only supports building with one toolkit,
dnl so ignore everything after the first comma (",").
MOZ_WIDGET_TOOLKIT=`echo "$_DEFAULT_TOOLKIT" | sed -e "s/,.*$//"`
else
AC_MSG_ERROR([You must specify a default toolkit (perhaps $_PLATFORM_DEFAULT_TOOLKIT).])
@@ -4080,22 +4022,16 @@ cairo-qt)
AC_DEFINE(MOZ_X11)
MOZ_X11=1
TK_CFLAGS='$(MOZ_QT_CFLAGS)'
TK_LIBS='$(MOZ_QT_LIBS)'
AC_DEFINE(MOZ_WIDGET_QT)
;;
-cairo-beos)
- MOZ_WIDGET_TOOLKIT=beos
- TK_CFLAGS='$(MOZ_CAIRO_CFLAGS)'
- TK_LIBS='$(MOZ_CAIRO_LIBS)'
- ;;
-
cairo-os2)
MOZ_WIDGET_TOOLKIT=os2
TK_CFLAGS='$(MOZ_CAIRO_CFLAGS)'
TK_LIBS='$(MOZ_CAIRO_LIBS)'
;;
cairo-cocoa)
MOZ_WIDGET_TOOLKIT=cocoa
@@ -5799,21 +5735,17 @@ AC_LANG_C
dnl ========================================================
dnl =
dnl = Build depencency options
dnl =
dnl ========================================================
MOZ_ARG_HEADER(Build dependencies)
if test "$GNU_CC" -a "$GNU_CXX"; then
- if test "$OS_ARCH" = "OpenVMS"; then
- _DEPEND_CFLAGS='$(subst =, ,$(filter-out %/.pp,-MM=-MD=-MF=$(MDDEPDIR)/$(basename $(@F)).pp))'
- else
- _DEPEND_CFLAGS='$(filter-out %/.pp,-MD -MF $(MDDEPDIR)/$(basename $(@F)).pp)'
- fi
+ _DEPEND_CFLAGS='$(filter-out %/.pp,-MD -MF $(MDDEPDIR)/$(basename $(@F)).pp)'
dnl Sun Studio on Solaris use -xM instead of -MD, see config/rules.mk
elif test "$SOLARIS_SUNPRO_CC"; then
_DEPEND_CFLAGS=
else
dnl Don't override this for MSVC
if test -z "$_WIN32_MSVC"; then
_USE_CPP_INCLUDE_FLAG=
_DEFINES_CFLAGS='$(ACDEFINES) -D_COMM_CONFIG_H_ -DMOZILLA_CLIENT'
@@ -5904,19 +5836,16 @@ MOZ_TREE_CAIRO=1 )
# Check for headers defining standard int types.
AC_CHECK_HEADERS(stdint.h inttypes.h sys/int_types.h)
if test "$MOZ_TREE_CAIRO"; then
if test "$MOZ_WIDGET_TOOLKIT" = "os2"; then
CAIRO_FT_LIBS="-L${MZFTCFGFT2}/lib -lmozft -lmzfntcfg"
fi
- if test "$MOZ_WIDGET_TOOLKIT" = "beos"; then
- PKG_CHECK_MODULES(CAIRO_FT, fontconfig freetype2)
- fi
MOZ_CAIRO_LIBS='$(call EXPAND_LIBNAME_PATH,mozcairo,$(DEPTH)/mozilla/gfx/cairo/cairo/src) $(call EXPAND_LIBNAME_PATH,mozlibpixman,$(DEPTH)/mozilla/gfx/cairo/libpixman/src)'" $CAIRO_FT_LIBS"
if test "$MOZ_X11"; then
MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS $XLDFLAGS -lXrender -lfreetype -lfontconfig"
fi
else
PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig)
MOZ_CAIRO_LIBS=$CAIRO_LIBS
@@ -6403,25 +6332,20 @@ if test "$MOZ_X11"; then
CFLAGS="$_SAVE_CFLAGS"
fi # MOZ_X11
fi # COMPILE_ENVIRONMENT
dnl Set various defines and substitutions
dnl ========================================================
-if test "$OS_ARCH" = "BeOS"; then
- AC_DEFINE(XP_BEOS)
- MOZ_MOVEMAIL=1
-elif test "$OS_ARCH" = "Darwin"; then
+if test "$OS_ARCH" = "Darwin"; then
AC_DEFINE(XP_UNIX)
AC_DEFINE(UNIX_ASYNC_DNS)
MOZ_MOVEMAIL=1
-elif test "$OS_ARCH" = "OpenVMS"; then
- AC_DEFINE(XP_UNIX)
elif test "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2"; then
AC_DEFINE(XP_UNIX)
AC_DEFINE(UNIX_ASYNC_DNS)
MOZ_MOVEMAIL=1
fi
AC_SUBST(MOZ_MOVEMAIL)
if test "$ACCESSIBILITY" -a "$MOZ_ENABLE_GTK2" ; then
--- a/mailnews/base/util/nsMsgUtils.cpp
+++ b/mailnews/base/util/nsMsgUtils.cpp
@@ -356,17 +356,17 @@ static bool ConvertibleToNative(const ns
NS_CopyNativeToUnicode(native, roundTripped);
#else
nsMsgI18NConvertFromUnicode(nsMsgI18NFileSystemCharset(), str, native);
nsMsgI18NConvertToUnicode(nsMsgI18NFileSystemCharset(), native, roundTripped);
#endif
return str.Equals(roundTripped);
}
-#if defined(XP_UNIX) || defined(XP_BEOS)
+#if defined(XP_UNIX)
const static uint32_t MAX_LEN = 55;
#elif defined(XP_WIN32)
const static uint32_t MAX_LEN = 55;
#elif defined(XP_OS2)
const static uint32_t MAX_LEN = 55;
#else
#error need_to_define_your_max_filename_length
#endif
--- a/mailnews/news/src/nsNntpIncomingServer.cpp
+++ b/mailnews/news/src/nsNntpIncomingServer.cpp
@@ -40,23 +40,23 @@
#define PREF_MAIL_NEWSRC_ROOT_REL "mail.newsrc_root-rel"
#define PREF_MAILNEWS_VIEW_DEFAULT_CHARSET "mailnews.view_default_charset"
#define HOSTINFO_FILE_NAME "hostinfo.dat"
#define NEWS_DELIMITER '.'
// this platform specific junk is so the newsrc filenames we create
// will resemble the migrated newsrc filenames.
-#if defined(XP_UNIX) || defined(XP_BEOS)
+#if defined(XP_UNIX)
#define NEWSRC_FILE_PREFIX "newsrc-"
#define NEWSRC_FILE_SUFFIX ""
#else
#define NEWSRC_FILE_PREFIX ""
#define NEWSRC_FILE_SUFFIX ".rc"
-#endif /* XP_UNIX || XP_BEOS */
+#endif /* XP_UNIX */
// ###tw This really ought to be the most
// efficient file reading size for the current
// operating system.
#define HOSTINFO_FILE_BUFFER_SIZE 1024
#include "nsMsgUtils.h"
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -76,20 +76,16 @@ endif
ifeq ($(OS_ARCH),OS2)
RESFILE = splashos2.res
RCFLAGS += -DMOZ_SUITE
RCFLAGS += -i $(MOZILLA_SRCDIR)/toolkit/xre
RCFLAGS += -DSEAMONKEY_ICO=\"$(DIST)/branding/seamonkey.ico\"
endif
-ifeq ($(OS_ARCH),BeOS)
-BEOS_PROGRAM_RESOURCE = apprunner-beos.rsrc
-endif
-
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH),WINNT)
#
# Control the default heap size.
# This is the heap returned by GetProcessHeap().
# As we use the CRT heap, the default size is too large and wastes VM.
#
deleted file mode 100644
index 27bc99cbce8b17aea65f490b87d170eca8f65983..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp
+++ b/suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp
@@ -215,22 +215,16 @@ nsThunderbirdProfileMigrator::FillProfil
thunderbirdData->Append(NS_LITERAL_STRING("Thunderbird"));
#elif defined(XP_UNIX)
fileLocator->Get(NS_UNIX_HOME_DIR, NS_GET_IID(nsIFile),
getter_AddRefs(thunderbirdData));
thunderbirdData->Append(NS_LITERAL_STRING(".thunderbird"));
-#elif defined(XP_BEOS)
- fileLocator->Get(NS_BEOS_SETTINGS_DIR, NS_GET_IID(nsIFile),
- getter_AddRefs(thunderbirdData));
-
- thunderbirdData->Append(NS_LITERAL_STRING("Thunderbird"));
-
#elif defined(XP_OS2)
fileLocator->Get(NS_OS2_HOME_DIR, NS_GET_IID(nsIFile),
getter_AddRefs(thunderbirdData));
thunderbirdData->Append(NS_LITERAL_STRING("Thunderbird"));
#else
// On other OS just abort
return NS_ERROR_FILE_NOT_FOUND;