View | Details | Raw Unified | Return to issue 8361
Collapse All | Expand All

(-)unx/source/app/i18n_im.cxx (-4 / +5 lines)
Lines 254-272 Link Here
254
			p_inlocale = aLocaleString.GetBuffer();
254
			p_inlocale = aLocaleString.GetBuffer();
255
		}
255
		}
256
	}
256
	}
257
	p_outlocale = p_inlocale;
257
258
	
259
	// FIXME
258
	// FIXME
260
	// setlocale() doesn't do much on Darwin 5 or 6.  Here, since setlocale() is
259
	// setlocale() doesn't do much on Darwin 5 or 6.  Here, since setlocale() is
261
	// #defined to _Xsetlocale() by our <X11/Xlocale.h>, it still doesn't work.
260
	// #defined to _Xsetlocale() by our <X11/Xlocale.h>, it still doesn't work.
262
	// Bypass it for MacOS X and Darwin.
263
	// NOTE:  On MacOS X, we can't set the locale anyway because its set in 
261
	// NOTE:  On MacOS X, we can't set the locale anyway because its set in 
264
	// the System Preferences application, under the International control panel.
262
	// the System Preferences application, under the International control panel.
265
	// Thus, the locale that we get from osl_getProcessLocale() is always valid as
263
	// Thus, the locale that we get from osl_getProcessLocale() is always valid as
266
	// its the locale that's already set.
264
	// its the locale that's already set.
267
	// NOTE 2:  This setlocale() is still valid for Darwin though.
265
	// NOTE 2:  This setlocale() is still valid for Darwin though.
268
#else
269
	if ( (p_outlocale = setlocale(LC_ALL, p_inlocale)) == NULL )
266
	if ( (p_outlocale = setlocale(LC_ALL, p_inlocale)) == NULL )
267
          p_outlocale = p_inlocale;		// Hack it so we return a good locale anyway	
268
269
#else
270
     if ( (p_outlocale = setlocale(LC_ALL, p_inlocale)) == NULL )
270
	{
271
	{
271
		fprintf( stderr, 
272
		fprintf( stderr, 
272
			"I18N: Operating system doesn't support locale \"%s\"\n", 
273
			"I18N: Operating system doesn't support locale \"%s\"\n", 
(-)unx/source/gdi/salprnpsp.cxx (-1 / +1 lines)
Lines 117-129 Link Here
117
 *	static helpers
117
 *	static helpers
118
 */
118
 */
119
119
120
#ifndef MACOSX
120
// NETBSD has no RTLD_GLOBAL
121
// NETBSD has no RTLD_GLOBAL
121
#ifndef RTLD_GLOBAL
122
#ifndef RTLD_GLOBAL
122
#define DLOPEN_MODE (RTLD_LAZY)
123
#define DLOPEN_MODE (RTLD_LAZY)
123
#else
124
#else
124
#define DLOPEN_MODE (RTLD_GLOBAL | RTLD_LAZY)
125
#define DLOPEN_MODE (RTLD_GLOBAL | RTLD_LAZY)
125
#endif
126
#endif
126
#ifndef MACOSX
127
#include <dlfcn.h>
127
#include <dlfcn.h>
128
#endif
128
#endif
129
#include <rtsname.hxx>
129
#include <rtsname.hxx>

Return to issue 8361