diff options
| author | Robert Mason <rbmj@verizon.net> | 2012-11-03 15:53:28 +0000 |
|---|---|---|
| committer | Bruce Korb <bkorb@gnu.org> | 2012-11-03 15:53:28 +0000 |
| commit | dd381efbde5c6014b943ddb87ec0a22efc0e3aac (patch) | |
| tree | a6986ee5adfb979a07e590f264651d5cf98a61ca /libstdc++-v3 | |
| parent | 3d5734bd3cc3388e5dd4eef143191625db6133aa (diff) | |
final patch for enabling VxWorks
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@193124 138bc75d-0d04-0410-961f-82ee72b054a4
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 75a3e11a8e8..3ceefae51f7 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 c66063e5311..93ad1d4b01f 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 |