diff options
| -rw-r--r-- | config/external/nss/Makefile.in | 11 | ||||
| -rw-r--r-- | config/rules.mk | 20 | ||||
| -rw-r--r-- | js/src/Makefile.in | 7 | ||||
| -rw-r--r-- | js/src/jstypes.h | 4 | ||||
| -rw-r--r-- | js/src/moz.build | 2 | ||||
| -rw-r--r-- | modules/libpref/init/all.js | 13 | ||||
| -rw-r--r-- | xpcom/reflect/xptcall/md/unix/Makefile.in | 11 | ||||
| -rw-r--r-- | xpcom/reflect/xptcall/md/unix/moz.build | 17 | ||||
| -rw-r--r-- | xpcom/reflect/xptcall/status.html | 15 |
9 files changed, 4 insertions, 96 deletions
diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in index 4b95a32bd..861b7d07d 100644 --- a/config/external/nss/Makefile.in +++ b/config/external/nss/Makefile.in @@ -43,17 +43,6 @@ endif # Default HAVE_FREEBL_LIBS = 1 -# 32-bit HP-UX PA-RISC -ifeq ($(OS_ARCH), HP-UX) -ifneq ($(OS_TEST), ia64) -ifndef HAVE_64BIT_BUILD -HAVE_FREEBL_LIBS = -HAVE_FREEBL_LIBS_32INT32 = 1 -HAVE_FREEBL_LIBS_32FPU = 1 -endif -endif -endif - # SunOS SPARC ifeq ($(OS_ARCH), SunOS) ifneq (86,$(findstring 86,$(OS_TEST))) diff --git a/config/rules.mk b/config/rules.mk index a6bd45d11..9a8f61c2d 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -386,26 +386,6 @@ endif endif endif -# -# HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag -# which uses internal symbols first -# -ifeq ($(OS_ARCH),HP-UX) -ifdef IS_COMPONENT -ifeq ($(GNU_CC)$(GNU_CXX),) -EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -ifneq ($(HAS_EXTRAEXPORTS),1) -MKSHLIB += -Wl,+eNSGetModule -Wl,+eerrno -MKCSHLIB += +eNSGetModule +eerrno -ifneq ($(OS_TEST),ia64) -MKSHLIB += -Wl,+e_shlInit -MKCSHLIB += +e_shlInit -endif # !ia64 -endif # !HAS_EXTRAEXPORTS -endif # non-gnu compilers -endif # IS_COMPONENT -endif # HP-UX - ifeq ($(OS_ARCH),AIX) ifdef IS_COMPONENT ifneq ($(HAS_EXTRAEXPORTS),1) diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 3be6a6781..b007954b1 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -147,13 +147,6 @@ ifeq ($(OS_ARCH),AIX) CFLAGS += -qsuppress=1540-1281 -qsuppress=1540-1608 CXXFLAGS += -qsuppress=1540-1281 -qsuppress=1540-1608 endif -ifeq ($(OS_ARCH),HP-UX) -# Suppress warnings from aCC -# 3055: anonymous unions declaring types -# 4189: offsetof() on non-POD types -CFLAGS += +W3055,4189 -CXXFLAGS += +W3055,4189 -endif endif ifeq ($(OS_ARCH),SunOS) ifeq ($(TARGET_CPU),sparc) diff --git a/js/src/jstypes.h b/js/src/jstypes.h index 6593d2067..75774e5b8 100644 --- a/js/src/jstypes.h +++ b/js/src/jstypes.h @@ -160,10 +160,6 @@ # if defined(__64BIT__) # define JS_64BIT # endif -#elif defined(__HP_cc) || defined(__HP_aCC) /* HP-UX cc/aCC */ -# if defined(__LP64__) -# define JS_64BIT -# endif #else # error "Implement me" #endif diff --git a/js/src/moz.build b/js/src/moz.build index a18170a75..2d4e83db3 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -708,7 +708,7 @@ if CONFIG['_MSC_VER']: CXXFLAGS += ['-wd4577'] CXXFLAGS += ['-wd4312'] -if CONFIG['OS_ARCH'] not in ('WINNT', 'HP-UX'): +if CONFIG['OS_ARCH'] not in ('WINNT'): OS_LIBS += [ 'm', ] diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index f2f628324..903665ff8 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -4753,23 +4753,16 @@ pref("alerts.showFavicons", false); // DOM full-screen API. pref("full-screen-api.enabled", false); -#ifdef RELEASE_OR_BETA -pref("full-screen-api.unprefix.enabled", false); -#else pref("full-screen-api.unprefix.enabled", true); -#endif pref("full-screen-api.allow-trusted-requests-only", true); pref("full-screen-api.pointer-lock.enabled", true); + // transition duration of fade-to-black and fade-from-black, unit: ms -#ifndef MOZ_WIDGET_GTK -pref("full-screen-api.transition-duration.enter", "200 200"); -pref("full-screen-api.transition-duration.leave", "200 200"); -#else pref("full-screen-api.transition-duration.enter", "0 0"); pref("full-screen-api.transition-duration.leave", "0 0"); -#endif + // timeout for black screen in fullscreen transition, unit: ms -pref("full-screen-api.transition.timeout", 1000); +pref("full-screen-api.transition.timeout", 500); // time for the warning box stays on the screen before sliding out, unit: ms pref("full-screen-api.warning.timeout", 3000); // delay for the warning box to show when pointer stays on the top, unit: ms diff --git a/xpcom/reflect/xptcall/md/unix/Makefile.in b/xpcom/reflect/xptcall/md/unix/Makefile.in index e4cdc389b..716d79623 100644 --- a/xpcom/reflect/xptcall/md/unix/Makefile.in +++ b/xpcom/reflect/xptcall/md/unix/Makefile.in @@ -7,17 +7,6 @@ # HPPA ###################################################################### # -# HP-UX/PA32 -# -# for gas and gcc, check comment in xptcinvoke_asm_pa32.s -ifeq ($(OS_ARCH),HP-UX) -ifneq ($(CC),gcc) -# #18875 Building the CPP's (CXX) optimized causes a crash -CXXFLAGS := $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS)) -endif -endif - -# # Linux/HPPA/gcc # ifeq ($(OS_ARCH),Linux) diff --git a/xpcom/reflect/xptcall/md/unix/moz.build b/xpcom/reflect/xptcall/md/unix/moz.build index 1d182bbd6..148d3bf35 100644 --- a/xpcom/reflect/xptcall/md/unix/moz.build +++ b/xpcom/reflect/xptcall/md/unix/moz.build @@ -108,23 +108,6 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['OS_ARCH'] in ('Bitrig', 'OpenBSD'): 'xptcstubs_arm_openbsd.cpp', ] -if CONFIG['OS_ARCH'] == 'HP-UX': - if CONFIG['CC'] != 'gcc': - if CONFIG['OS_TEST'] == 'ia64': - SOURCES += [ - 'xptcinvoke_asm_ipf32.s', - 'xptcinvoke_ipf32.cpp', - 'xptcstubs_asm_ipf32.s', - 'xptcstubs_ipf32.cpp', - ] - else: - SOURCES += [ - 'xptcinvoke_asm_pa32.s', - 'xptcinvoke_pa32.cpp', - 'xptcstubs_asm_pa32.s', - 'xptcstubs_pa32.cpp' - ] - if CONFIG['OS_ARCH'] == 'Linux': if CONFIG['OS_TEST'] in ('hppa', 'hppa2.0', 'hppa1.1'): if CONFIG['GNU_CXX']: diff --git a/xpcom/reflect/xptcall/status.html b/xpcom/reflect/xptcall/status.html index 65de20596..7f8e54a0c 100644 --- a/xpcom/reflect/xptcall/status.html +++ b/xpcom/reflect/xptcall/status.html @@ -255,21 +255,6 @@ The word I hear is that this is working and done <TR> <TD bgcolor="green"><font color="white"><b>Done</b></font></TD> -<TD>HP-UX</TD> -<TD> -<img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif"> -<a href="mailto:wang@cup.hp.com">Thomas Wang <wang@cup.hp.com></a><BR> -<img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif"> -<a href="mailto:mgleeson1@netscape.com">Mike Gleeson <mgleeson1@netscape.com></a> -</TD> -<TD>I hear that this code is checked in and working. Though, there is some -doubt - see bug -#<a href="http://bugzilla.mozilla.org/show_bug.cgi?id=17997">17997</a> -</TD> -</TR> - -<TR> -<TD bgcolor="green"><font color="white"><b>Done</b></font></TD> <TD>AIX PPC</TD> <TD><img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif"> <a href="mailto:jdunn@netscape.com">Jim Dunn <jdunn@netscape.com></a></TD> |