diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 15:37:04 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 15:37:04 +0100 |
| commit | 778b755a3fe25b887e00b93daa5d169072a195fe (patch) | |
| tree | 0f9b1605ece871ba1c225216ed57d0b627cf14b1 | |
| parent | 7ee4dfb7ab571692c2a1bdee1d7c11754f439733 (diff) | |
fixes for AIX
| -rw-r--r-- | tools/source/stream/strmunx.cxx | 2 | ||||
| -rw-r--r-- | tools/source/string/makefile.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index 88ccb2113e0d..ad341c220446 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -209,7 +209,7 @@ static sal_uInt32 GetSvError( int nErrno ) { 0, SVSTREAM_OK }, { EACCES, SVSTREAM_ACCESS_DENIED }, { EBADF, SVSTREAM_INVALID_HANDLE }, -#if defined( RS6000 ) || defined( ALPHA ) || defined( HP9000 ) || defined( NETBSD ) || defined(FREEBSD) || defined(MACOSX) || defined(__FreeBSD_kernel__) +#if defined( RS6000 ) || defined( ALPHA ) || defined( HP9000 ) || defined( NETBSD ) || defined(FREEBSD) || defined(MACOSX) || defined(__FreeBSD_kernel__) || defined ( AIX ) { EDEADLK, SVSTREAM_LOCKING_VIOLATION }, #else { EDEADLOCK, SVSTREAM_LOCKING_VIOLATION }, diff --git a/tools/source/string/makefile.mk b/tools/source/string/makefile.mk index 4caa31672472..255feac2e6f9 100644 --- a/tools/source/string/makefile.mk +++ b/tools/source/string/makefile.mk @@ -37,7 +37,9 @@ TARGET=str # --- Files -------------------------------------------------------- +.IF "$(OS)"!="AIX" ALWAYSDBGFILES = $(SLO)$/debugprint.obj +.ENDIF .IF "$(ALWAYSDBGFILES)" != "" ALWAYSDBGTARGET=do_it_alwaysdebug |