diff options
| author | Steve Huston <shuston@riverace.com> | 2015-02-27 16:40:13 -0500 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2015-02-27 16:40:13 -0500 |
| commit | 277de4b2774b2db2194682475abb7e8be542bff1 (patch) | |
| tree | dfd6be83eb9a0d689b40e86a4d4c5e9e881f4980 | |
| parent | 4d3d640b33043b409cf73db1bd51574f43eefaa1 (diff) | |
| download | ATCD-277de4b2774b2db2194682475abb7e8be542bff1.tar.gz | |
Change from using typedef to macro definitions because the needed system header(s) are not always included and including them here would add unnecessary build time.
| -rw-r--r-- | ACE/ace/config-vxworks.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/ACE/ace/config-vxworks.h b/ACE/ace/config-vxworks.h index 4be30a027a8..9d0ea65e25c 100644 --- a/ACE/ace/config-vxworks.h +++ b/ACE/ace/config-vxworks.h @@ -55,20 +55,22 @@ #endif // Adapt to system argument changes added at VxWorks 6.9 and 64-bit. +// It would be nicer to typedef the data types, but without including the +// applicable VxWorks headers here, that doesn't work. #if (ACE_VXWORKS < 0x690) - typedef int ACE_VX_USR_ARG_T; - typedef int ACE_VX_TASK_ID -# define ACE_VX_ARG_FORMAT "%x" -# define ACE_VX_TASK_ID_ERROR ERROR -#else - typedef _Vx_usr_arg_t ACE_VX_USR_ARG_T; - typedef TASK_ID ACE_VX_TASK_ID -# ifdef _WRS_CONFIG_LP64 -# define ACE_VX_ARG_FORMAT "%lx" -# else +# define ACE_VX_USR_ARG_T int +# define ACE_VX_TASK_ID int # define ACE_VX_ARG_FORMAT "%x" -# endif -# define ACE_VX_TASK_ID_ERROR TASK_ID_ERROR +# define ACE_VX_TASK_ID_ERROR ERROR +#else +# define ACE_VX_USR_ARG_T _Vx_usr_arg_t +# define ACE_VX_TASK_ID TASK_ID +# ifdef _WRS_CONFIG_LP64 +# define ACE_VX_ARG_FORMAT "%lx" +# else +# define ACE_VX_ARG_FORMAT "%x" +# endif +# define ACE_VX_TASK_ID_ERROR TASK_ID_ERROR #endif #include /**/ "ace/post.h" |