Index: bootstrp/cppdep.cxx
===================================================================
RCS file: /cvs/util/tools/bootstrp/cppdep.cxx,v
retrieving revision 1.8
diff -u -r1.8 cppdep.cxx
--- bootstrp/cppdep.cxx	27 Mar 2003 17:02:58 -0000	1.8
+++ bootstrp/cppdep.cxx	9 Jul 2003 15:57:24 -0000
@@ -72,10 +72,12 @@
  
 #ifdef UNX
 #ifdef MACOSX
+#if ( __GNUC__ < 3 )
 #ifdef BOOTSTRAPPER
 #include <glibc/posix/getopt.h>
 #else
 #include <glibc/getopt.h>
+#endif
 #endif
 #endif
 #include <unistd.h>
Index: source/intntl/intnunx.cxx
===================================================================
RCS file: /cvs/util/tools/source/intntl/intnunx.cxx,v
retrieving revision 1.6
diff -u -r1.6 intnunx.cxx
--- source/intntl/intnunx.cxx	8 Apr 2003 16:11:12 -0000	1.6
+++ source/intntl/intnunx.cxx	9 Jul 2003 15:57:33 -0000
@@ -72,6 +72,15 @@
 #include <isolang.hxx>
 #endif
 
+#ifdef MACOSX
+#ifndef _OSL_PROCESS_H_
+#include <osl/process.h>
+#endif
+#ifndef _RTL_LOCALE_H_
+#include <rtl/locale.h>
+#endif
+#endif
+
 // =======================================================================
 
 static LanguageType eImplSystemLanguage = LANGUAGE_DONTKNOW;
@@ -139,8 +148,24 @@
     {
         if ( eImplSystemLanguage == LANGUAGE_DONTKNOW )
         {
+#ifdef MACOSX
+            rtl_Locale    *procLocale;
+            
+            if ( osl_getProcessLocale(&procLocale) == osl_Process_E_None )
+            {
+                UniString     rLang( procLocale->Language->buffer );
+                UniString     rCountry( procLocale->Country->buffer );
+            
+                eImplSystemLanguage = ConvertIsoNamesToLanguage( rLang, rCountry );
+#ifdef DEBUG
+                if ( eImplSystemLanguage == LANGUAGE_DONTKNOW )
+                    fprintf( stderr, "intnunx.cxx:  failed to convert osl_getProcessLocale() language to system language.\n" );
+#endif
+            }
+#else   /* MACOSX */
             ByteString aUnxLang (GetLangFromEnvironment());
             eImplSystemLanguage = ConvertUnxByteStringToLanguage( aUnxLang );
+#endif  /* MACOSX */
         }
         return eImplSystemLanguage;
     }
@@ -157,8 +182,24 @@
     {
         if ( eImplSystemLanguage == LANGUAGE_DONTKNOW )
         {
-            ByteString aUnxLang (GetUILangFromEnvironment());
+#ifdef MACOSX
+            rtl_Locale    *procLocale;
+            
+            if ( osl_getProcessLocale(&procLocale) == osl_Process_E_None )
+            {
+                UniString     rLang( procLocale->Language->buffer );
+                UniString     rCountry( procLocale->Country->buffer );
+            
+                eImplSystemLanguage = ConvertIsoNamesToLanguage( rLang, rCountry );
+#ifdef DEBUG
+                if ( eImplSystemLanguage == LANGUAGE_DONTKNOW )
+                    fprintf( stderr, "intnunx.cxx:  failed to convert osl_getProcessLocale() language to system language.\n" );
+#endif
+            }
+#else   /* MACOSX */
+            ByteString aUnxLang (GetLangFromEnvironment());
             eImplSystemLanguage = ConvertUnxByteStringToLanguage( aUnxLang );
+#endif  /* MACOSX */
         }
         return eImplSystemLanguage;
     }