diff options
| author | Sander Vesik <svesik@openoffice.org> | 2001-05-01 23:51:02 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2001-05-01 23:51:02 +0000 |
| commit | ad0431d77d4a22da80f5053946bf38ed2bf0ee38 (patch) | |
| tree | 2c04a750dccebe416b05bd8feb740970c7855d7f /vcl | |
| parent | 9916d1729289bdd70eb319e088f818ea987d172a (diff) | |
Merge OO625B to trunk
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/app/i18n_ic.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/source/app/i18n_ic.cxx index 922ca1311537..07f7128c6cb4 100644 --- a/vcl/unx/source/app/i18n_ic.cxx +++ b/vcl/unx/source/app/i18n_ic.cxx @@ -2,9 +2,9 @@ * * $RCSfile: i18n_ic.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: svesik $ $Date: 2001-02-16 01:04:00 $ + * last change: $Author: svesik $ $Date: 2001-05-02 00:48:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ #include <stdio.h> -#if defined(NETBSD) +#if defined(NETBSD) || defined(FREEBSD) # include <stdlib.h> #else # include <alloca.h> @@ -242,7 +242,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame, mnStatusStyle( 0 ), mnPreeditStyle( 0 ), mnSupportedStatusStyle( - #ifdef LINUX + #if defined LINUX || defined FREEBSD XIMStatusCallbacks | #endif XIMStatusNothing | XIMStatusNone |