fix MachO bustage - MachO should be using mac locale, not unix

This commit is contained in:
alecf%netscape.com 2002-09-25 00:52:16 +00:00
parent 7dc2740b1d
commit 7b2abfdb4f
2 changed files with 12 additions and 4 deletions

View File

@ -341,7 +341,7 @@ static nsModuleComponentInfo components[] =
nsDateTimeFormatWinConstructor },
#endif
#ifdef XP_UNIX
#ifdef USE_UNIX_LOCALE
{ "Platform locale",
NS_POSIXLOCALE_CID,
NS_POSIXLOCALE_CONTRACTID,
@ -358,7 +358,7 @@ static nsModuleComponentInfo components[] =
nsDateTimeFormatUnixConstructor },
#endif
#ifdef XP_MAC
#ifdef USE_MAC_LOCALE
{ "Mac locale",
NS_MACLOCALE_CID,
NS_MACLOCALE_CONTRACTID,

View File

@ -50,13 +50,21 @@
#include "nsLanguageAtomService.h"
#include "nsLocaleCID.h"
#if defined(XP_MAC) || defined(XP_MACOSX)
#define USE_MAC_LOCALE
#endif
#if defined(XP_UNIX) && !defined(XP_MACOSX)
#define USE_UNIX_LOCALE
#endif
#ifdef XP_WIN
#include "nsIWin32LocaleImpl.h"
#include "nsCollationWin.h"
#include "nsDateTimeFormatWin.h"
#endif
#ifdef XP_MAC
#ifdef USE_MAC_LOCALE
#ifdef USE_UCCOLLATIONKEY
#include "nsCollationMacUC.h"
#else
@ -66,7 +74,7 @@
#include "nsMacLocale.h"
#endif
#ifdef XP_UNIX
#ifdef USE_UNIX_LOCALE
#include "nsCollationUnix.h"
#include "nsDateTimeFormatUnix.h"
#include "nsPosixLocale.h"