From 20cdcd428000216bb614b66f06a0f6d24f38f358 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sun, 28 Nov 2010 03:20:36 +0300 Subject: [PATCH] [10789] Allow use old non-builting ACE versions (pre-ACE-5.5.4) at Unix-side. This fix build error in relamd code in result nonexistence ACE_OFF_T in old ACE versions. --- src/shared/Common.h | 7 +++++++ src/shared/revision_nr.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/shared/Common.h b/src/shared/Common.h index e525f868e..a804ef45b 100644 --- a/src/shared/Common.h +++ b/src/shared/Common.h @@ -97,6 +97,13 @@ #include #include +// Old ACE versions (pre-ACE-5.5.4) not have this type (add for allow use at Unix side external old ACE versions) +#if PLATFORM != PLATFORM_WINDOWS +# ifndef ACE_OFF_T +typedef off_t ACE_OFF_T; +# endif +#endif + #if PLATFORM == PLATFORM_WINDOWS # if !defined (FD_SETSIZE) # define FD_SETSIZE 4096 diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b72d78909..662932d71 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10788" + #define REVISION_NR "10789" #endif // __REVISION_NR_H__