diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 08:19:55 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 08:19:55 +0000 |
| commit | 257b3205cae2665a96492b806df10faf884a4e99 (patch) | |
| tree | a62a9ec17d2421eace78ae757479a20b31b45efd /sal/osl/os2 | |
| parent | 4ca5c503bc36f0300bb3f3ec1577ed41df098ab2 (diff) | |
CWS-TOOLING: integrate CWS cloph11
Diffstat (limited to 'sal/osl/os2')
| -rw-r--r-- | sal/osl/os2/socket.c | 10 | ||||
| -rw-r--r-- | sal/osl/os2/system.h | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/sal/osl/os2/socket.c b/sal/osl/os2/socket.c index b7a598d20cdd..de70e5b8885a 100644 --- a/sal/osl/os2/socket.c +++ b/sal/osl/os2/socket.c @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: socket.c,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.60.1 $ * * This file is part of OpenOffice.org. * @@ -48,7 +48,7 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) +#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) || defined (MACOSX) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ @@ -58,12 +58,6 @@ #define HAVE_POLL_H #endif /* SOLARIS */ -#if defined(MACOSX) -/* Include our own poll.h because OS X doesn't implement one */ -#include "poll.h" -#define HAVE_POLL_H -#endif - #ifndef HAVE_POLL_H #define POLLIN 0x0001 #define POLLOUT 0x0002 diff --git a/sal/osl/os2/system.h b/sal/osl/os2/system.h index 5dc36e1afae2..565dfe3ea9c6 100644 --- a/sal/osl/os2/system.h +++ b/sal/osl/os2/system.h @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: system.h,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.60.1 $ * * This file is part of OpenOffice.org. * @@ -379,10 +379,7 @@ extern char *strdup(const char *); # define NO_PTHREAD_RTL /* for NSGetArgc/Argv/Environ */ # include <crt_externs.h> -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 ); #endif #ifdef OS2 |