diff options
| author | Ingrid Halama <iha@openoffice.org> | 2010-01-28 16:29:55 +0100 |
|---|---|---|
| committer | Ingrid Halama <iha@openoffice.org> | 2010-01-28 16:29:55 +0100 |
| commit | 4d25f2a41929080258462cb53b843c52d084d0c9 (patch) | |
| tree | e22c6dfac5970f28a0b60c2f28c4d100e28a1e72 /sal/osl/unx/system.h | |
| parent | 837894606a612539ab16f4eb3256b5bc5153f27d (diff) | |
| parent | a2cadf4bc167c9a5ad534af03f7960c6ef477c05 (diff) | |
chartmultiline: merge with DEV300_m70
Diffstat (limited to 'sal/osl/unx/system.h')
| -rw-r--r-- | sal/osl/unx/system.h | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h index c2e01126fb58..91f3b9fb7ae0 100644 --- a/sal/osl/unx/system.h +++ b/sal/osl/unx/system.h @@ -270,34 +270,6 @@ extern unsigned int nanosleep(unsigned int); # define PTHREAD_SIGACTION cma_sigaction #endif -#ifdef IRIX -# define AF_IPX -1 -# include <pthread.h> -# include <semaphore.h> -# include <sched.h> -# include <sys/socket.h> -# include <sys/un.h> -# include <sys/stropts.h> -# include <netinet/tcp.h> -# include <sys/endian.h> -# if BYTE_ORDER == LITTLE_ENDIAN -# undef _BIG_ENDIAN -# undef _PDP_ENDIAN -# elif BYTE_ORDER == BIG_ENDIAN -# undef _LITTLE_ENDIAN -# undef _PDP_ENDIAN -# elif BYTE_ORDER == PDP_ENDIAN -# undef _LITTLE_ENDIAN -# undef _BIG_ENDIAN -# endif -# define SA_FAMILY_DECL \ - union { struct { short sa_family2; } sa_generic; } sa_union -# define NO_PTHREAD_PRIORITY -# include <dlfcn.h> -# define IOCHANNEL_TRANSFER_BSD -extern char *strdup(const char *); -#endif - #ifdef SOLARIS # include <shadow.h> # include <sys/un.h> @@ -364,8 +336,7 @@ int macxp_resolveAlias(char *path, int buflen); #if !defined(_WIN32) && !defined(_WIN16) && !defined(OS2) && \ !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO) && \ !defined(AIX) && !defined(HPUX) && \ - !defined(SOLARIS) && !defined(IRIX) && \ - !defined(MACOSX) + !defined(SOLARIS) && !defined(MACOSX) # error "Target platform not specified!" #endif |