Port bug 1535226 - s/XP_WIN32/XP_WIN/ in #ifdef's in C-C. rs=bustage-fix DONTBUILD
authorJorg K <jorgk@jorgk.com>
Fri, 22 Mar 2019 10:17:35 +0100
changeset 26143 fd6b3628b5bc
parent 26142 2ab8c7d1987f
child 26144 fc995375f444
push id15693
push usermozilla@jorgk.com
push dateFri, 22 Mar 2019 09:18:11 +0000
treeherdercomm-central@fd6b3628b5bc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1535226
Port bug 1535226 - s/XP_WIN32/XP_WIN/ in #ifdef's in C-C. rs=bustage-fix DONTBUILD
ldap/c-sdk/libraries/libldif/line64.c
mail/components/build/nsMailComps.cpp
mail/installer/package-manifest.in
mailnews/base/util/nsMsgUtils.cpp
mailnews/compose/src/nsMsgComposeService.cpp
--- a/ldap/c-sdk/libraries/libldif/line64.c
+++ b/ldap/c-sdk/libraries/libldif/line64.c
@@ -561,31 +561,31 @@ ldif_get_entry( FILE *fp, int *lineno )
 	buf = NULL;
 	max = cur = gotsome = 0;
 	while ( fgets( line, sizeof(line), fp ) != NULL ) {
 		if ( lineno != NULL ) {
 			(*lineno)++;
 		}
 		/* ldif entries are terminated by a \n on a line by itself */
 		if ( line[0] == '\0' || line[0] == '\n'
-#if !defined( XP_WIN32 )
+#if !defined( XP_WIN )
 		     || ( line[0] == '\r' && line[1] == '\n' ) /* DOS format */
 #endif
 		   ) {
 			if ( gotsome ) {
 				break;
 			} else {
 				continue;
 			}
 		} else if ( line[0] == '#' ) {
 			continue;
 		}
 		gotsome = 1;
 		len = strlen( line );
-#if !defined( XP_WIN32 )
+#if !defined( XP_WIN )
 		/* DOS format */
 		if ( len > 0 && line[len-1] == '\r' ) {
 			--len;
 			line[len] = '\0';
 		} else if ( len > 1 && line[len-2] == '\r' && line[len-1] == '\n' ) {
 			--len;
 			line[len-1] = line[len];
 			line[len] = '\0';
--- a/mail/components/build/nsMailComps.cpp
+++ b/mail/components/build/nsMailComps.cpp
@@ -10,17 +10,17 @@
 #include "DirectoryProvider.h"
 
 using namespace mozilla::mail;
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSeamonkeyProfileMigrator)
 
-#ifdef XP_WIN32
+#ifdef XP_WIN
 
 #include "nsOutlookProfileMigrator.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsOutlookProfileMigrator)
 
 #include "nsWindowsShellService.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowsShellService, Init)
 #endif
 
@@ -28,66 +28,66 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWi
 #include "nsGNOMEShellService.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
 #endif
 #ifdef XP_MACOSX
 #include "nsMacShellService.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
 #endif
 
-#if defined(XP_WIN32)
+#if defined(XP_WIN)
 #include "nsMailWinSearchHelper.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMailWinSearchHelper, Init)
 #endif
 
 NS_DEFINE_NAMED_CID(NS_MAILDIRECTORYPROVIDER_CID);
 NS_DEFINE_NAMED_CID(NS_THUNDERBIRD_PROFILEIMPORT_CID);
 NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEMIGRATOR_CID);
 
-#ifdef XP_WIN32
+#ifdef XP_WIN
 NS_DEFINE_NAMED_CID(NS_OUTLOOKPROFILEMIGRATOR_CID);
 NS_DEFINE_NAMED_CID(NS_MAILWININTEGRATION_CID);
 NS_DEFINE_NAMED_CID(NS_MAILWINSEARCHHELPER_CID);
-#endif // !XP_WIN32
+#endif // !XP_WIN
 
 #ifdef MOZ_WIDGET_GTK
 NS_DEFINE_NAMED_CID(NS_MAILGNOMEINTEGRATION_CID);
 #endif
 
 #ifdef XP_MACOSX
 NS_DEFINE_NAMED_CID(NS_MAILMACINTEGRATION_CID);
 #endif
 
 const mozilla::Module::CIDEntry kMailCIDs[] = {
   { &kNS_MAILDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor },
   { &kNS_THUNDERBIRD_PROFILEIMPORT_CID, false, NULL, nsProfileMigratorConstructor },
   { &kNS_SEAMONKEYPROFILEMIGRATOR_CID, false, NULL, nsSeamonkeyProfileMigratorConstructor },
-#ifdef XP_WIN32
+#ifdef XP_WIN
   { &kNS_OUTLOOKPROFILEMIGRATOR_CID, false, NULL, nsOutlookProfileMigratorConstructor },
   { &kNS_MAILWININTEGRATION_CID, false, NULL, nsWindowsShellServiceConstructor },
   { &kNS_MAILWINSEARCHHELPER_CID, false, NULL, nsMailWinSearchHelperConstructor },
-#endif // !XP_WIN32
+#endif // !XP_WIN
 #ifdef MOZ_WIDGET_GTK
   { &kNS_MAILGNOMEINTEGRATION_CID, false, NULL, nsGNOMEShellServiceConstructor },
 #endif
 #ifdef XP_MACOSX
   { &kNS_MAILMACINTEGRATION_CID, false, NULL, nsMacShellServiceConstructor },
 #endif
   { NULL }
 };
 
 const mozilla::Module::ContractIDEntry kMailContracts[] = {
   { NS_MAILDIRECTORYPROVIDER_CONTRACTID, &kNS_MAILDIRECTORYPROVIDER_CID },
   { NS_PROFILEMIGRATOR_CONTRACTID, &kNS_THUNDERBIRD_PROFILEIMPORT_CID },
   { NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX "seamonkey", &kNS_SEAMONKEYPROFILEMIGRATOR_CID },
-#ifdef XP_WIN32
+#ifdef XP_WIN
   { NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX "outlook", &kNS_OUTLOOKPROFILEMIGRATOR_CID },
   { "@mozilla.org/mail/shell-service;1", &kNS_MAILWININTEGRATION_CID },
   { "@mozilla.org/mail/windows-search-helper;1", &kNS_MAILWINSEARCHHELPER_CID },
-#endif // !XP_WIN32
+#endif // !XP_WIN
 #ifdef MOZ_WIDGET_GTK
   { "@mozilla.org/mail/shell-service;1", &kNS_MAILGNOMEINTEGRATION_CID },
 #endif
 #ifdef XP_MACOSX
   { "@mozilla.org/mail/shell-service;1", &kNS_MAILMACINTEGRATION_CID },
 #endif
   { NULL }
 };
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -88,17 +88,17 @@
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #ifdef XP_MACOSX
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
 @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
-#ifdef XP_WIN32
+#ifdef XP_WIN
 @BINPATH@/plugin-hang-ui@BIN_SUFFIX@
 #if MOZ_PACKAGE_MSVC_DLLS
 @BINPATH@/@MSVC_C_RUNTIME_DLL@
 @BINPATH@/@MSVC_CXX_RUNTIME_DLL@
 #endif
 #if MOZ_PACKAGE_WIN_UCRT_DLLS
 @BINPATH@/api-ms-win-*.dll
 @BINPATH@/ucrtbase.dll
@@ -342,31 +342,31 @@
 #endif
 
 ; Address Book autocomplete
 @RESPATH@/components/nsAbAutoCompleteMyDomain.js
 @RESPATH@/components/nsAbAutoCompleteSearch.js
 
 ; Windows Search integration
 ; the module is included as part of the "Modules" rule
-#ifdef XP_WIN32
+#ifdef XP_WIN
 @BINPATH@/WSEnable.exe
 #endif
 
 ; Bayesian trait analysis
 @RESPATH@/components/nsMsgTraitService.js
 @RESPATH@/components/nsMsgTraitService.manifest
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Base Package Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; accessibility (out of process API support)
 #ifdef ACCESSIBILITY
-#ifdef XP_WIN32
+#ifdef XP_WIN
 @BINPATH@/Accessible.tlb
 @BINPATH@/AccessibleHandler.dll
 @BINPATH@/AccessibleMarshal.dll
 @BINPATH@/IA2Marshal.dll
 #endif
 #endif
 
 ; toolkit
--- a/mailnews/base/util/nsMsgUtils.cpp
+++ b/mailnews/base/util/nsMsgUtils.cpp
@@ -326,17 +326,17 @@ static bool ConvertibleToNative(const ns
     nsAutoString roundTripped;
     NS_CopyUnicodeToNative(str, native);
     NS_CopyNativeToUnicode(native, roundTripped);
     return str.Equals(roundTripped);
 }
 
 #if defined(XP_UNIX)
   const static uint32_t MAX_LEN = 55;
-#elif defined(XP_WIN32)
+#elif defined(XP_WIN)
   const static uint32_t MAX_LEN = 55;
 #else
   #error need_to_define_your_max_filename_length
 #endif
 
 nsresult NS_MsgHashIfNecessary(nsAutoCString &name)
 {
   if (name.IsEmpty())
--- a/mailnews/compose/src/nsMsgComposeService.cpp
+++ b/mailnews/compose/src/nsMsgComposeService.cpp
@@ -57,17 +57,17 @@
 #include "nsMsgUtils.h"
 #endif
 
 #include "nsICommandLine.h"
 #include "nsIAppStartup.h"
 #include "nsMsgUtils.h"
 #include "nsIPrincipal.h"
 
-#ifdef XP_WIN32
+#ifdef XP_WIN
 #include <windows.h>
 #include <shellapi.h>
 #include "nsIWidget.h"
 #endif
 
 #define DEFAULT_CHROME  "chrome://messenger/content/messengercompose/messengercompose.xul"
 
 #define PREF_MAILNEWS_REPLY_QUOTING_SELECTION            "mailnews.reply_quoting_selection"