Bug 1540442 - Replace XP_WIN32 with XP_WIN in suite. r=IanN
Port Bug 1535226 [Remove uses of XP_WIN32 in Gecko].
This commit is contained in:
Родитель
bfea5a8081
Коммит
4c86b4e018
|
@ -35,7 +35,7 @@ comm.jar:
|
|||
content/navigator/platformNavigationBindings.xul (mac/platformNavigationBindings.xul)
|
||||
content/navigator/platformMailOverlay.xul (mac/platformMailOverlay.xul)
|
||||
#else
|
||||
#ifdef XP_WIN32
|
||||
#ifdef XP_WIN
|
||||
content/navigator/platformNavigationBindings.xul (win/platformNavigationBindings.xul)
|
||||
content/navigator/platformMailOverlay.xul (win/platformMailOverlay.xul)
|
||||
#else
|
||||
|
|
|
@ -157,7 +157,7 @@
|
|||
|
||||
; [Components]
|
||||
#ifdef ACCESSIBILITY
|
||||
#ifdef XP_WIN32
|
||||
#ifdef XP_WIN
|
||||
@BINPATH@/Accessible.tlb
|
||||
@BINPATH@/AccessibleHandler.dll
|
||||
@BINPATH@/AccessibleMarshal.dll
|
||||
|
@ -288,7 +288,7 @@
|
|||
#ifdef MOZ_UPDATER
|
||||
@RESPATH@/icons/updater.png
|
||||
#endif
|
||||
#elifdef XP_WIN32
|
||||
#elifdef XP_WIN
|
||||
@RESPATH@/chrome/icons/default/bookmarkproperties.ico
|
||||
@RESPATH@/chrome/icons/default/downloadManager.ico
|
||||
@RESPATH@/chrome/icons/default/editorWindow.ico
|
||||
|
@ -504,7 +504,7 @@ man/*
|
|||
@RESPATH@/chrome/icons/default/msgcomposeWindow.png
|
||||
@RESPATH@/chrome/icons/default/msgcomposeWindow16.png
|
||||
@RESPATH@/chrome/icons/default/msgcomposeWindow48.png
|
||||
#elifdef XP_WIN32
|
||||
#elifdef XP_WIN
|
||||
@RESPATH@/chrome/icons/default/abcardWindow.ico
|
||||
@RESPATH@/chrome/icons/default/ablistWindow.ico
|
||||
@RESPATH@/chrome/icons/default/addressbookWindow.ico
|
||||
|
|
|
@ -110,7 +110,7 @@
|
|||
@DIR_MACOS@chrome/icons/default/venkman-window.png
|
||||
@DIR_MACOS@chrome/icons/default/venkman-window16.png
|
||||
@DIR_MACOS@chrome/icons/default/venkman-window48.png
|
||||
#elifdef XP_WIN32
|
||||
#elifdef XP_WIN
|
||||
chrome/icons/default/venkman-window.ico
|
||||
#endif
|
||||
#ifndef ENABLE_TESTS
|
||||
|
|
|
@ -78,7 +78,7 @@ messenger.jar:
|
|||
#ifdef XP_MACOSX
|
||||
content/messenger/platformMailnewsOverlay.xul (content/mac/platformMailnewsOverlay.xul)
|
||||
#else
|
||||
#ifdef XP_WIN32
|
||||
#ifdef XP_WIN
|
||||
content/messenger/platformMailnewsOverlay.xul (content/win/platformMailnewsOverlay.xul)
|
||||
#else
|
||||
content/messenger/platformMailnewsOverlay.xul (content/unix/platformMailnewsOverlay.xul)
|
||||
|
|
Загрузка…
Ссылка в новой задаче