strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS pj51 (1.28.22); FILE MERGED

Browse source 
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
This commit is contained in:
Vladimir Glazounov 2006-04-07 07:06:48 +00:00
parent 3bc554dd72
commit c34f2e30bb
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sal/osl/unx/system.h
View file

@ -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) && \