diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:48:15 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:48:15 +0000 |
| commit | d4f025b0ebd8cc0a3ba2587905a726462494456b (patch) | |
| tree | 4db2d7a45599d63cac05a66621c3b93a6e9c1fb1 /registry/source | |
| parent | 72494cf53b6e631c099ec34a4d4fb6974ea3da5b (diff) | |
INTEGRATION: CWS os2port01 (1.22.12); FILE MERGED
2007/09/05 08:36:11 obr 1.22.12.3: RESYNC: (1.24-1.25); FILE MERGED
2007/07/18 07:17:23 obr 1.22.12.2: RESYNC: (1.22-1.24); FILE MERGED
2006/12/28 15:03:32 ydario 1.22.12.1: OS/2 initial import.
Diffstat (limited to 'registry/source')
| -rw-r--r-- | registry/source/regimpl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index 9e3bdb53a262..583bf1e0e07b 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: regimpl.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: hr $ $Date: 2007-07-31 14:03:01 $ + * last change: $Author: vg $ $Date: 2007-09-20 14:48:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,7 +39,7 @@ #include <string.h> #include <stdio.h> -#ifdef UNX +#if defined(UNX) || defined(OS2) #include <unistd.h> #endif #ifdef __MINGW32__ @@ -102,7 +102,7 @@ #endif -#if defined ( GCC ) && ( defined ( SCO ) || defined ( OS2 ) ) +#if defined ( GCC ) && ( defined ( SCO ) ) sal_helper::ORealDynamicLoader* sal_helper::ODynamicLoader<RegistryTypeReader_Api>::m_pLoader = NULL; #endif |