diff options
| author | Robert Mason <rbmj@verizon.net> | 2012-11-03 15:53:28 +0000 |
|---|---|---|
| committer | Bruce Korb <korbb@gcc.gnu.org> | 2012-11-03 15:53:28 +0000 |
| commit | 2588b26e0e0374bccd928e2d102e81a9e334fc0b (patch) | |
| tree | a6986ee5adfb979a07e590f264651d5cf98a61ca /libstdc++-v3 | |
| parent | 358a3dbce6aad5488da4c4dd68d37ca74fbe4157 (diff) | |
| download | gcc-2588b26e0e0374bccd928e2d102e81a9e334fc0b.zip gcc-2588b26e0e0374bccd928e2d102e81a9e334fc0b.tar.gz gcc-2588b26e0e0374bccd928e2d102e81a9e334fc0b.tar.bz2 | |
final patch for enabling VxWorks
From-SVN: r193124
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/config/os/vxworks/os_defines.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 75a3e11..3ceefae 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2012-11-03 Robert Mason <rbmj@verizon.net> + + * config/os/vxworks/os_defines.h: + Keep vxWorks from defining min()/max() as macros + 2012-11-03 Jonathan Wakely <jwakely.gcc@gmail.com> * doc/html/*: Regenerate. diff --git a/libstdc++-v3/config/os/vxworks/os_defines.h b/libstdc++-v3/config/os/vxworks/os_defines.h index c66063e..93ad1d4 100644 --- a/libstdc++-v3/config/os/vxworks/os_defines.h +++ b/libstdc++-v3/config/os/vxworks/os_defines.h @@ -33,4 +33,10 @@ // System-specific #define, typedefs, corrections, etc, go here. This // file will come before all others. +//Keep vxWorks from defining min()/max() as macros +#ifdef NOMINMAX +#undef NOMINMAX +#endif +#define NOMINMAX 1 + #endif |