Skip to content

Commit 1c077cf

Browse files
committed
Bug 1606274 - Remove always-true MOZ_PHOENIX macro. r=firefox-build-system-reviewers,rstewart
MOZ_PHOENIX was a macro added back in 2002 to differentiate SeaMonkey and Phoenix appshell bits. The earliest references to MOZ_PHOENIX I can find in Gecko's pre-hg history are bug 161448, bug 213228, bug 243091, and mozilla@05ef2e9. Differential Revision: https://phabricator.services.mozilla.com/D58358 --HG-- extra : moz-landing-system : lando
1 parent eb0f4ad commit 1c077cf

File tree

4 files changed

+7
-24
lines changed

4 files changed

+7
-24
lines changed

browser/app/moz.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ if CONFIG['CC_TYPE'] == 'clang-cl':
6969

7070
if CONFIG['OS_ARCH'] == 'WINNT':
7171
RCINCLUDE = 'splash.rc'
72-
DEFINES['MOZ_PHOENIX'] = True
7372
DIRS += [
7473
'winlauncher',
7574
]

browser/confvars.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
MOZ_APP_BASENAME=Firefox
77
MOZ_APP_VENDOR=Mozilla
88
MOZ_UPDATER=1
9-
MOZ_PHOENIX=1
109

1110
if test "$OS_ARCH" = "WINNT"; then
1211
if ! test "$HAVE_64BIT_BUILD"; then

old-configure.in

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,22 +1674,11 @@ if test -n "$WITH_APP_BASENAME" ; then
16741674
MOZ_APP_BASENAME="$WITH_APP_BASENAME"
16751675
fi
16761676

1677-
# Special cases where we need to AC_DEFINE something. Also a holdover for apps
1678-
# that haven't made a confvars.sh yet. Don't add new stuff here, use
1679-
# MOZ_BUILD_APP.
1680-
case "$MOZ_BUILD_APP" in
1681-
browser)
1682-
AC_DEFINE(MOZ_PHOENIX)
1683-
;;
1684-
esac
1685-
16861677
# Graphene is a desktop runtime for running applications with a HTML UI.
16871678
if test -n "$MOZ_GRAPHENE"; then
16881679
AC_DEFINE(MOZ_GRAPHENE)
16891680
fi
16901681

1691-
AC_SUBST(MOZ_PHOENIX)
1692-
16931682
dnl ========================================================
16941683
dnl Ensure Android SDK and build-tools versions depending on
16951684
dnl mobile target.

toolkit/xre/nsNativeAppSupportWin.h

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,13 @@
1313

1414
// Constants identifying Win32 "native" resources.
1515

16-
#ifdef MOZ_PHOENIX
17-
18-
# define IDI_APPICON 1
19-
# define IDI_DOCUMENT 2
20-
# define IDI_NEWWINDOW 3
21-
# define IDI_NEWTAB 4
22-
# define IDI_PBMODE 5
23-
# ifndef IDI_APPLICATION
24-
# define IDI_APPLICATION 32512
25-
# endif
26-
16+
#define IDI_APPICON 1
17+
#define IDI_DOCUMENT 2
18+
#define IDI_NEWWINDOW 3
19+
#define IDI_NEWTAB 4
20+
#define IDI_PBMODE 5
21+
#ifndef IDI_APPLICATION
22+
# define IDI_APPLICATION 32512
2723
#endif
2824

2925
// String that goes in the WinXP Start Menu.

0 commit comments

Comments
 (0)