epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge 3.14 changes from 2011-06-06 to 2011-08-17

Browse Source
This commit is contained in:
Andrew Johnson
2011-08-17 16:36:38 -05:00
parent c49db7c176 2b4edba8f3
commit d25ee10b71
25 changed files with 145 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure/os/CONFIG.Common.vxWorksCommon
View File

@@ -160,7 +160,7 @@ export TOOL_FAMILY = GNU
#--------------------------------------------------
# Operating system flags
OP_SYS_CPPFLAGS += -DvxWorks
OP_SYS_CPPFLAGS += -DvxWorks=vxWorks
OP_SYS_CFLAGS += -fno-builtin
# Fix for vxWorks 5 headers that use macros defined in vxWorks.h but