From 83d84ddcffbf2b59b9278745c51aeb0aa5a5d5b5 Mon Sep 17 00:00:00 2001
From: "mkaply%us.ibm.com"
 <mkaply%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 29 Apr 2004 17:33:43 +0000
Subject: [PATCH] #242011 r=mkaply Code from pedemonte - build break -don't
 build opera migration stuff on OS/2

git-svn-id: svn://10.0.0.236/trunk@155694 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/components/build/nsModule.cpp               | 6 ++++++
 mozilla/browser/components/migration/src/Makefile.in        | 5 ++++-
 .../components/migration/src/nsOperaProfileMigrator.cpp     | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/mozilla/browser/components/build/nsModule.cpp b/mozilla/browser/components/build/nsModule.cpp
index 48226c197d6..8bb052c22e1 100644
--- a/mozilla/browser/components/build/nsModule.cpp
+++ b/mozilla/browser/components/build/nsModule.cpp
@@ -49,7 +49,9 @@
 #endif
 #include "nsProfileMigrator.h"
 #include "nsDogbertProfileMigrator.h"
+#if !defined(XP_OS2)
 #include "nsOperaProfileMigrator.h"
+#endif
 #include "nsPhoenixProfileMigrator.h"
 #include "nsSeamonkeyProfileMigrator.h"
 #if defined(XP_WIN) && !defined(__MINGW32__)
@@ -74,7 +76,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsGNOMEShellService)
 #endif
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator)
+#if !defined(XP_OS2)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator)
+#endif
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPhoenixProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSeamonkeyProfileMigrator)
@@ -159,10 +163,12 @@ static const nsModuleComponentInfo components[] =
 
 #endif
 
+#if !defined(XP_OS2)
   { "Opera Profile Migrator",
     NS_OPERAPROFILEMIGRATOR_CID,
     NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "opera",
     nsOperaProfileMigratorConstructor },
+#endif
 
   { "Phoenix Profile Migrator",
     NS_PHOENIXPROFILEMIGRATOR_CID,
diff --git a/mozilla/browser/components/migration/src/Makefile.in b/mozilla/browser/components/migration/src/Makefile.in
index 133fd4a6436..29b0e2367bf 100644
--- a/mozilla/browser/components/migration/src/Makefile.in
+++ b/mozilla/browser/components/migration/src/Makefile.in
@@ -73,9 +73,12 @@ CPPSRCS  = nsProfileMigrator.cpp \
            nsSeamonkeyProfileMigrator.cpp \
            nsPhoenixProfileMigrator.cpp \
            nsINIParser.cpp \
-           nsOperaProfileMigrator.cpp \
            $(NULL)
 
+ifneq ($(OS_ARCH),OS2)
+CPPSRCS += nsOperaProfileMigrator.cpp
+endif
+
 ifeq ($(OS_ARCH)_$(GNU_CXX),WINNT_)
 DEFINES += -DPSTOREC_DLL=\"$(subst \,\\,$(WINDIR))\\system32\\pstorec.dll\"
 
diff --git a/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp b/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp
index dd969249e55..57a160029fc 100644
--- a/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp
+++ b/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp
@@ -86,6 +86,8 @@ static NS_DEFINE_CID(kGlobalHistoryCID, NS_GLOBALHISTORY_CID);
 #define OPERA_PREFERENCES_FILE_NAME NS_LITERAL_STRING("opera6.ini")
 #define OPERA_HISTORY_FILE_NAME NS_LITERAL_STRING("global.dat")
 #define OPERA_BOOKMARKS_FILE_NAME NS_LITERAL_STRING("opera6.adr")
+#else
+#error Need to define location of Opera Profile data.
 #endif
 #define OPERA_COOKIES_FILE_NAME NS_LITERAL_STRING("cookies4.dat")