diff options
-rw-r--r-- | ACE/ChangeLog | 21 | ||||
-rw-r--r-- | ACE/ace/POSIX_Asynch_IO.h | 5 | ||||
-rw-r--r-- | ACE/ace/POSIX_CB_Proactor.h | 6 | ||||
-rw-r--r-- | ACE/ace/config-aix-5.x.h | 1 | ||||
-rw-r--r-- | ACE/ace/config-macosx.h | 1 | ||||
-rw-r--r-- | ACE/ace/config-rtems.h | 1 | ||||
-rw-r--r-- | ACE/ace/config-sunos5.4-g++.h | 3 | ||||
-rw-r--r-- | ACE/ace/config-sunos5.4-sunc++-4.x.h | 1 | ||||
-rw-r--r-- | ACE/ace/config-sunos5.5.h | 2 | ||||
-rw-r--r-- | ACE/ace/config-vxworks5.x.h | 1 | ||||
-rw-r--r-- | ACE/ace/config-vxworks6.2.h | 1 | ||||
-rw-r--r-- | ACE/ace/config-vxworks6.3.h | 1 | ||||
-rw-r--r-- | ACE/ace/config-vxworks6.4.h | 1 |
13 files changed, 38 insertions, 7 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 1f046d7b342..7800ed49c9f 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,24 @@ +Mon Jan 1 06:39:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/POSIX_CB_Proactor.h: + Introduced new ACE_LACKS_SIGVAL_T, when this is defined then ACE + does a typedef for sigval_t + + * ace/config-aix-5.x.h: + * ace/config-macosx.h: + * ace/config-rtems.h: + * ace/config-sunos5.4-g++.h: + * ace/config-sunos5.4-sunc++-4.x.h: + * ace/config-sunos5.5.h: + * ace/config-vxworks5.x.h: + * ace/config-vxworks6.2.h: + * ace/config-vxworks6.3.h: + * ace/config-vxworks6.4.h: + Added ACE_LACKS_SIGVAL_T + + * ace/POSIX_Asynch_IO.h: + Doxygen improvement + Sun Dec 31 22:33:14 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * tests/SV_Shared_Memory_Test.cpp: diff --git a/ACE/ace/POSIX_Asynch_IO.h b/ACE/ace/POSIX_Asynch_IO.h index 97f5120d0ae..243fddc990f 100644 --- a/ACE/ace/POSIX_Asynch_IO.h +++ b/ACE/ace/POSIX_Asynch_IO.h @@ -71,12 +71,11 @@ public: * This is the ACT associated with the handle on which the * Asynch_Operation takes place. * - * @@ This is not implemented for POSIX4 platforms. - * + * @note This is not implemented for POSIX4 platforms. */ const void *completion_key (void) const; - /// Error value if the operation fail. + /// Error value if the operation fails. u_long error (void) const; /// This returns ACE_INVALID_HANDLE on POSIX4 platforms. diff --git a/ACE/ace/POSIX_CB_Proactor.h b/ACE/ace/POSIX_CB_Proactor.h index 0daea7aea41..2b844c180a8 100644 --- a/ACE/ace/POSIX_CB_Proactor.h +++ b/ACE/ace/POSIX_CB_Proactor.h @@ -27,7 +27,7 @@ #include "ace/POSIX_Proactor.h" -#if defined(AIX) || defined(sun) || defined(__APPLE__) || defined (ACE_VXWORKS) +#if defined (ACE_LACKS_SIGVAL_T) typedef union sigval sigval_t; #endif @@ -83,13 +83,13 @@ protected: virtual int notify_completion (int sig_num); /** - * Dispatch a single set of events. If <milli_seconds> elapses + * Dispatch a single set of events. If @a milli_seconds elapses * before any events occur, return 0. Return 1 if a completion is * dispatched. Return -1 on errors. */ int handle_events_i (u_long milli_seconds); - /// semaphore variable to notify + /// Semaphore variable to notify /// used to wait the first AIO start ACE_SYNCH_SEMAPHORE sema_; }; diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h index 6d900b749c4..36d31fb2900 100644 --- a/ACE/ace/config-aix-5.x.h +++ b/ACE/ace/config-aix-5.x.h @@ -334,5 +334,6 @@ #define ACE_SCANDIR_SEL_LACKS_CONST #define ACE_HAS_SIGSUSPEND #define ACE_HAS_TIMEZONE /* Call tzset() to set timezone */ +#define ACE_LACKS_SIGVAL_T #endif /* ACE_CONFIG_AIX_5_X_H */ diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h index 6219caf8bc7..215894604c6 100644 --- a/ACE/ace/config-macosx.h +++ b/ACE/ace/config-macosx.h @@ -171,6 +171,7 @@ #define ACE_HAS_GETIFADDRS #define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES #define ACE_LACKS_UNNAMED_SEMAPHORE +#define ACE_LACKS_SIGVAL_T // dlcompat package (not part of base Darwin) is needed for dlopen(). // You may download directly from sourceforge and install or use fink diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h index 96f8a6f4eb2..1b85448f784 100644 --- a/ACE/ace/config-rtems.h +++ b/ACE/ace/config-rtems.h @@ -124,6 +124,7 @@ #define ACE_LACKS_SETREUID_PROTOTYPE #define ACE_LACKS_SETREGID #define ACE_LACKS_SETREGID_PROTOTYPE +#define ACE_LACKS_SIGVAL_T #define ACE_LACKS_STRPTIME #define ACE_LACKS_STRRECVFD #define ACE_LACKS_SI_ADDR diff --git a/ACE/ace/config-sunos5.4-g++.h b/ACE/ace/config-sunos5.4-g++.h index 8530ebdecde..cb431bf7520 100644 --- a/ACE/ace/config-sunos5.4-g++.h +++ b/ACE/ace/config-sunos5.4-g++.h @@ -15,6 +15,7 @@ // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so // this must appear before its #include. #define ACE_HAS_STRING_CLASS +#define ACE_LACKS_SIGVAL_T #include "ace/config-g++-common.h" #define ACE_HAS_GNU_CSTRING_H @@ -27,7 +28,7 @@ #define ACE_HAS_XPG4_MULTIBYTE_CHAR // Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS +#define ACE_HAS_TERMIOS // Platform supports System V IPC (most versions of UNIX, but not Win32) #define ACE_HAS_SYSV_IPC diff --git a/ACE/ace/config-sunos5.4-sunc++-4.x.h b/ACE/ace/config-sunos5.4-sunc++-4.x.h index 882307aab64..bb8e4a17a76 100644 --- a/ACE/ace/config-sunos5.4-sunc++-4.x.h +++ b/ACE/ace/config-sunos5.4-sunc++-4.x.h @@ -12,6 +12,7 @@ # define __ACE_INLINE__ #endif /* ! __ACE_INLINE__ */ +#define ACE_LACKS_SIGVAL_T #define ACE_HAS_TEMPLATE_SPECIALIZATION // Optimize ACE_Handle_Set for select(). diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h index d829cf14642..5fe33487e16 100644 --- a/ACE/ace/config-sunos5.5.h +++ b/ACE/ace/config-sunos5.5.h @@ -407,5 +407,7 @@ # define ACE_HAS_3_PARAM_READDIR_R #endif +#define ACE_LACKS_SIGVAL_T + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-vxworks5.x.h b/ACE/ace/config-vxworks5.x.h index a5e54b5e989..af1cedc425e 100644 --- a/ACE/ace/config-vxworks5.x.h +++ b/ACE/ace/config-vxworks5.x.h @@ -246,6 +246,7 @@ #define ACE_LACKS_TERMIOS_H #define ACE_LACKS_POLL_H #define ACE_LACKS_WCTYPE_H +#define ACE_LACKS_SIGVAL_T // Not sure if these should always be defined. #define ACE_LACKS_SYS_UN_H diff --git a/ACE/ace/config-vxworks6.2.h b/ACE/ace/config-vxworks6.2.h index 979106e62dd..8ce5073d28c 100644 --- a/ACE/ace/config-vxworks6.2.h +++ b/ACE/ace/config-vxworks6.2.h @@ -131,6 +131,7 @@ #define ACE_LACKS_MPROTECT #define ACE_LACKS_MSYNC #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS +#define ACE_LACKS_SIGVAL_T #define ACE_LACKS_SYS_PARAM_H #define ACE_LACKS_PWD_FUNCTIONS #define ACE_LACKS_READDIR_R diff --git a/ACE/ace/config-vxworks6.3.h b/ACE/ace/config-vxworks6.3.h index daad755584f..44aef87c779 100644 --- a/ACE/ace/config-vxworks6.3.h +++ b/ACE/ace/config-vxworks6.3.h @@ -103,6 +103,7 @@ #define ACE_LACKS_RWLOCK_T #define ACE_LACKS_SBRK #define ACE_LACKS_SEEKDIR +#define ACE_LACKS_SIGVAL_T #define ACE_LACKS_SEMBUF_T #define ACE_LACKS_SIGINFO_H #define ACE_LACKS_SI_ADDR diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h index 3425d90170f..d9a54a2d240 100644 --- a/ACE/ace/config-vxworks6.4.h +++ b/ACE/ace/config-vxworks6.4.h @@ -113,6 +113,7 @@ #define ACE_LACKS_SEEKDIR #define ACE_LACKS_SEMBUF_T #define ACE_LACKS_SIGINFO_H +#define ACE_LACKS_SIGVAL_T #define ACE_LACKS_SI_ADDR #define ACE_LACKS_SOCKETPAIR #define ACE_LACKS_STRRECVFD |