diff options
| author | Joachim Lingner <jl@openoffice.org> | 2001-03-16 12:14:43 +0000 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2001-03-16 12:14:43 +0000 |
| commit | 4fd04b6224b240bc8b890f4d25d71442108fb1c1 (patch) | |
| tree | 1e0ad1606a99b1d7ee83f0e4cc11eda13980b52b | |
| parent | 36a6c0fada6fe2e753b8cbd22f0daa1b6ae00792 (diff) | |
#include <osl/types.h> removed and #include <sal/types.h inserted
| -rw-r--r-- | sal/inc/osl/profile.h | 12 | ||||
| -rw-r--r-- | sal/osl/unx/conditn.c | 9 | ||||
| -rw-r--r-- | sal/osl/unx/module.c | 11 |
3 files changed, 17 insertions, 15 deletions
diff --git a/sal/inc/osl/profile.h b/sal/inc/osl/profile.h index ed63b03277df..a136c9adaed2 100644 --- a/sal/inc/osl/profile.h +++ b/sal/inc/osl/profile.h @@ -2,9 +2,9 @@ * * $RCSfile: profile.h,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: martin.maher $ $Date: 2000-09-29 14:43:19 $ + * last change: $Author: jl $ $Date: 2001-03-16 13:10:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,12 +62,12 @@ #ifndef _OSL_PROFILE_H_ #define _OSL_PROFILE_H_ -#ifndef _RTL_USTRING_H -# include <rtl/ustring.h> +#ifndef _SAL_TYPES_H_ +#include <sal/types.h> #endif -#ifndef _OSL_TYPES_H_ -# include <osl/types.h> +#ifndef _RTL_USTRING_H +# include <rtl/ustring.h> #endif #ifdef __cplusplus diff --git a/sal/osl/unx/conditn.c b/sal/osl/unx/conditn.c index 8276c53ccd8d..93569f36c010 100644 --- a/sal/osl/unx/conditn.c +++ b/sal/osl/unx/conditn.c @@ -2,9 +2,9 @@ * * $RCSfile: conditn.c,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jl $ $Date: 2001-03-14 09:48:11 $ + * last change: $Author: jl $ $Date: 2001-03-16 13:14:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,8 +62,11 @@ #include "system.h" +#ifndef _SAL_TYPES_H_ +#include <sal/types.h> +#endif + #include <osl/conditn.h> -#include <osl/types.h> #include <osl/diagnose.h> #ifndef _OSL_TIME_H_ diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c index d6ff4f4c8ff8..64fbc5a842f0 100644 --- a/sal/osl/unx/module.c +++ b/sal/osl/unx/module.c @@ -2,9 +2,9 @@ * * $RCSfile: module.c,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: mfe $ $Date: 2001-03-16 12:15:21 $ + * last change: $Author: jl $ $Date: 2001-03-16 13:14:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,15 +59,14 @@ * ************************************************************************/ +#ifndef _SAL_TYPES_H_ +#include <sal/types.h> +#endif #ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> #endif -#ifndef _OSL_TYPES_H_ -#include <osl/types.h> -#endif - #ifndef _OSL_MODULE_H_ #include <osl/module.h> #endif |