diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 07:06:48 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 07:06:48 +0000 |
| commit | c34f2e30bbad1a6b92308d0daabe413bd1bc161b (patch) | |
| tree | 8ac04c40022887a7d45778ad14696dd225aada01 /sal | |
| parent | 3bc554dd727347bdf4228695d2427c0f36c32ac1 (diff) | |
INTEGRATION: CWS pj51 (1.28.22); FILE MERGED
2006/03/20 21:00:08 pjanik 1.28.22.2: RESYNC: (1.28-1.29); FILE MERGED
Use proper fix.
2006/03/18 16:29:29 obr 1.28.22.1: #i61959# patch applied
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/system.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h index f3a30cac4551..fd12831b3213 100644 --- a/sal/osl/unx/system.h +++ b/sal/osl/unx/system.h @@ -4,9 +4,9 @@ * * $RCSfile: system.h,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: rt $ $Date: 2006-03-08 14:14:53 $ + * last change: $Author: vg $ $Date: 2006-04-07 08:06:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -334,6 +334,10 @@ extern char *strdup(const char *); #endif #ifdef MACOSX +#define __OPENTRANSPORTPROVIDERS__ // these are already defined +#define TimeValue CFTimeValue // Do not conflict with TimeValue in sal/inc/osl/time.h +#include <Carbon/Carbon.h> +#undef TimeValue # ifndef ETIME # define ETIME ETIMEDOUT # endif @@ -372,6 +376,13 @@ int readdir_r( DIR *dirp, struct dirent *entry, struct dirent **result ); char *asctime_r( const struct tm *tm, char *buffer ); char *macxp_tempnam( const char *tmpdir, const char *prefix ); void macxp_getSystemVersion( unsigned int *isDarwin, unsigned int *majorVersion, unsigned int *minorVersion, unsigned int *minorMinorVersion ); +#ifdef __cplusplus +extern "C" { +#endif +int macxp_resolveAlias(char *path, int buflen); +#ifdef __cplusplus +} +#endif #endif #if !defined(_WIN32) && !defined(_WIN16) && !defined(OS2) && \ |