diff options
author | Martin Hollmichel <mh@openoffice.org> | 2002-04-09 17:07:42 +0000 |
---|---|---|
committer | Martin Hollmichel <mh@openoffice.org> | 2002-04-09 17:07:42 +0000 |
commit | 2cc3a200639de24c9778720ea7273051a50ba243 (patch) | |
tree | 44f3e1ef3c4745340c3ed2a379beb771a3adac4a | |
parent | 1efd6af527c44264fd2d153014881823c3c5e06e (diff) |
merge2top: merge branch OOO_STABLE_1 (1.8.2)
2002/04/09 18:00:09 mh 1.8.2.1: join from OOO638C, macosx enhancements
-rw-r--r-- | sal/inc/osl/module.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sal/inc/osl/module.h b/sal/inc/osl/module.h index 215b6bb1637a..48018be4234b 100644 --- a/sal/inc/osl/module.h +++ b/sal/inc/osl/module.h @@ -2,9 +2,9 @@ * * $RCSfile: module.h,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obr $ $Date: 2001-11-12 15:51:50 $ + * last change: $Author: mh $ $Date: 2002-04-09 18:07:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,7 +85,11 @@ extern "C" { #define SAL_MODULENAME_WITH_VERSION(name, version) name version SAL_DLLEXTENSION #elif defined(SAL_UNX) +#if defined(MACOSX) +#define SAL_MODULENAME_WITH_VERSION(name, version) SAL_DLLPREFIX name ".dylib." version ".framework" +#else #define SAL_MODULENAME_WITH_VERSION(name, version) SAL_DLLPREFIX name SAL_DLLEXTENSION "." version +#endif #endif @@ -101,7 +105,7 @@ struct _oslModule void* pModule; sal_Char* pModuleName; }; -typedef struct _oslModule* oslModule; +typedef struct _oslModule * oslModule; #else typedef void* oslModule; #endif |