diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-10-10 18:21:39 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-10-10 18:21:39 +0000 |
| commit | e3ced699e0c8d3edb9883197186339b9117af59a (patch) | |
| tree | 002d7f20d09d5b805f59c29dd802a5bc52877d62 | |
| parent | fa1ef068b2265bd820755aad81b5e700b6da8de6 (diff) | |
| download | ATCD-e3ced699e0c8d3edb9883197186339b9117af59a.tar.gz | |
Sat Oct 10 18:21:41 UTC 2009 Olli Savia <ops@iki.fi>
* ace/config-vxworks.h:
* ace/config-vxworks6.8.h:
* include/makeinclude/platform_vxworks.GNU:
* include/makeinclude/platform_vxworks6.8.GNU:
Default configuration files for VxWorks 6.8
| -rw-r--r-- | ACE/ChangeLog | 10 | ||||
| -rw-r--r-- | ACE/ace/config-vxworks.h | 4 | ||||
| -rw-r--r-- | ACE/ace/config-vxworks6.8.h | 21 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks.GNU | 4 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks6.8.GNU | 9 |
5 files changed, 47 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 696f39f01de..89e74ef0aa9 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,9 +1,17 @@ +Sat Oct 10 18:21:41 UTC 2009 Olli Savia <ops@iki.fi> + + * ace/config-vxworks.h: + * ace/config-vxworks6.8.h: + * include/makeinclude/platform_vxworks.GNU: + * include/makeinclude/platform_vxworks6.8.GNU: + Default configuration files for VxWorks 6.8 + Fri Oct 9 14:09:41 UTC 2009 Olli Savia <ops@iki.fi> * ace/config-openbsd.h: Define ACE_HAS_ICMP_SUPPORT to value 1. -+Fri Oct 9 08:04:25 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> +Fri Oct 9 08:04:25 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Thread_Attrs_Test.cpp: Fixed compile error in single threaded builds diff --git a/ACE/ace/config-vxworks.h b/ACE/ace/config-vxworks.h index e2e0c2e35f7..2d77c978732 100644 --- a/ACE/ace/config-vxworks.h +++ b/ACE/ace/config-vxworks.h @@ -31,6 +31,8 @@ # define ACE_VXWORKS 0x660 # elif (_WRS_VXWORKS_MINOR == 7) # define ACE_VXWORKS 0x670 +# elif (_WRS_VXWORKS_MINOR == 8) +# define ACE_VXWORKS 0x680 # endif # endif # endif @@ -44,6 +46,8 @@ # include "ace/config-vxworks6.6.h" #elif (ACE_VXWORKS == 0x670) # include "ace/config-vxworks6.7.h" +#elif (ACE_VXWORKS == 0x680) +# include "ace/config-vxworks6.8.h" #else #error Unknown or unsupported VxWorks version #endif diff --git a/ACE/ace/config-vxworks6.8.h b/ACE/ace/config-vxworks6.8.h new file mode 100644 index 00000000000..e092e8ca241 --- /dev/null +++ b/ACE/ace/config-vxworks6.8.h @@ -0,0 +1,21 @@ +//* -*- C++ -*- */ +// $Id$ + +// The following configuration file is designed to work for VxWorks +// 6.8 platforms using one of these compilers: +// 1) The GNU g++ compiler that is shipped with VxWorks 6.8 +// 2) The Diab compiler that is shipped with VxWorks 6.8 + +#ifndef ACE_CONFIG_VXWORKS_6_8_H +#define ACE_CONFIG_VXWORKS_6_8_H +#include /**/ "ace/pre.h" + +#if !defined (ACE_VXWORKS) +# define ACE_VXWORKS 0x680 +#endif /* ! ACE_VXWORKS */ + +#include "ace/config-vxworks6.7.h" + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_VXWORKS_6_8_H */ + diff --git a/ACE/include/makeinclude/platform_vxworks.GNU b/ACE/include/makeinclude/platform_vxworks.GNU index f94e2687948..30db5614a42 100644 --- a/ACE/include/makeinclude/platform_vxworks.GNU +++ b/ACE/include/makeinclude/platform_vxworks.GNU @@ -25,4 +25,8 @@ endif ifeq (vxworks-6.7, $(findstring vxworks-6.7,$(WIND_PLATFORM))) include $(ACE_ROOT)/include/makeinclude/platform_vxworks6.7.GNU endif +ifeq (vxworks-6.8, $(findstring vxworks-6.8,$(WIND_PLATFORM))) + include $(ACE_ROOT)/include/makeinclude/platform_vxworks6.8.GNU +endif + diff --git a/ACE/include/makeinclude/platform_vxworks6.8.GNU b/ACE/include/makeinclude/platform_vxworks6.8.GNU new file mode 100644 index 00000000000..c671c58a4a0 --- /dev/null +++ b/ACE/include/makeinclude/platform_vxworks6.8.GNU @@ -0,0 +1,9 @@ +# $Id$ +# VxWorks 6.8 + +ifeq ($(VXWORKS_VERSION_FLAG),) + VXWORKS_VERSION_FLAG = -DACE_VXWORKS=0x680 +endif # VXWORKS_VERSION_FLAG + +include $(ACE_ROOT)/include/makeinclude/platform_vxworks6.7.GNU + |