diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 15:06:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 20:31:42 +0100 |
| commit | 1aae667817ddbe7b35bc2be4cc81c991eeda2e0e (patch) | |
| tree | 0e1be32d99d699484006c2b4b5c465ce1c13c842 /sal/inc | |
| parent | aa5755e6dc03258c53a626aa74566d1307bf6136 (diff) | |
AIX port
Diffstat (limited to 'sal/inc')
| -rw-r--r-- | sal/inc/osl/endian.h | 8 | ||||
| -rw-r--r-- | sal/inc/rtl/uuid.h | 2 | ||||
| -rw-r--r-- | sal/inc/sal/alloca.h | 2 | ||||
| -rw-r--r-- | sal/inc/sal/config.h | 2 | ||||
| -rw-r--r-- | sal/inc/sal/main.h | 8 |
5 files changed, 15 insertions, 7 deletions
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h index b79c1f6456ac..5f07162d4005 100644 --- a/sal/inc/osl/endian.h +++ b/sal/inc/osl/endian.h @@ -106,9 +106,13 @@ extern "C" { #ifdef AIX # include <sys/machine.h> # if BYTE_ORDER == LITTLE_ENDIAN -# define _LITTLE_ENDIAN +# ifndef _LITTLE_ENDIAN +# define _LITTLE_ENDIAN +# endif # elif BYTE_ORDER == BIG_ENDIAN -# define _BIG_ENDIAN +# ifndef _BIG_ENDIAN +# define _BIG_ENDIAN +# endif # elif BYTE_ORDER == PDP_ENDIAN # define _PDP_ENDIAN # endif diff --git a/sal/inc/rtl/uuid.h b/sal/inc/rtl/uuid.h index 3ff5bb2c1232..56e4acdf4348 100644 --- a/sal/inc/rtl/uuid.h +++ b/sal/inc/rtl/uuid.h @@ -198,6 +198,8 @@ void SAL_CALL rtl_createNamedUuid( #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10 #elif MACOSX #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 100000 +#elif AIX +#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10 #else #error "System time resolution must be calculated!" #endif diff --git a/sal/inc/sal/alloca.h b/sal/inc/sal/alloca.h index 17c242c4d1e2..a54025c2eb51 100644 --- a/sal/inc/sal/alloca.h +++ b/sal/inc/sal/alloca.h @@ -28,7 +28,7 @@ #ifndef INCLUDED_SAL_ALLOCA_H #define INCLUDED_SAL_ALLOCA_H -#if defined (SOLARIS) || defined (LINUX) || defined(__EMX__) +#if defined (SOLARIS) || defined (LINUX) || defined(__EMX__) || defined(AIX) #ifndef INCLUDED_ALLOCA_H #include <alloca.h> diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h index 1e8656a3ec14..59ca36a4fc96 100644 --- a/sal/inc/sal/config.h +++ b/sal/inc/sal/config.h @@ -91,7 +91,7 @@ #define SAL_SYSCONFIGFILE( name ) name ".ini" #endif -#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(SCO) +#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(SCO) || defined(AIX) #define SAL_UNX #define SAL_DLLEXTENSION ".so" #define SAL_DLLPREFIX "lib" diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h index f360e4c95f19..c6841a96e313 100644 --- a/sal/inc/sal/main.h +++ b/sal/inc/sal/main.h @@ -29,6 +29,9 @@ #define _SAL_MAIN_H_ #include <sal/types.h> +#if defined(AIX) +# include <unistd.h> +#endif #ifdef __cplusplus extern "C" { @@ -44,7 +47,7 @@ int SAL_CALL main(int argc, char ** argv) \ sal_detail_initialize(argc, argv); \ ret = sal_main_with_args(argc, argv); \ sal_detail_deinitialize(); \ - return ret; \ + return x; \ } #define SAL_MAIN_IMPL \ @@ -54,10 +57,9 @@ int SAL_CALL main(int argc, char ** argv) \ sal_detail_initialize(argc, argv); \ ret = sal_main(); \ sal_detail_deinitialize(); \ - return ret; \ + return x; \ } - /* Definition macros for CRT entries */ #ifdef SAL_W32 |