From 52e28d7a7a0a3eee0eac1f4a447bf3640af6f21b Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Sat, 2 Dec 2006 00:09:16 +0000 Subject: [PATCH] Ok, so all vxWorks 5.x versions need the -include vxWorks.h flag... --- configure/os/CONFIG.Common.vxWorksCommon | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index ff7b586cf..d189413dc 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -127,10 +127,11 @@ OP_SYS_CFLAGS += -fno-builtin #OP_SYS_CFLAGS += -fno-builtin -fdollars-in-identifiers OP_SYS_LDFLAGS += -# Fix for vxWorks headers using macros defined in -# vxWorks.h but not including vxWorks.h -OP_SYS_INCLUDE_CPPFLAGS_5.5 += -include $(VX_DIR)/target/h/vxWorks.h -OP_SYS_INCLUDE_CPPFLAGS = $(OP_SYS_INCLUDE_CPPFLAGS_$(VXWORKS_VERSION)) +# Fix for vxWorks headers that use macros defined in vxWorks.h but +# which don't actually include vxWorks.h themselves, for example the +# target/h/sys/stat.h file which uses ULONG +OP_SYS_INCLUDE_CPPFLAGS_5 += -include $(VX_DIR)/target/h/vxWorks.h +OP_SYS_INCLUDE_CPPFLAGS = $(OP_SYS_INCLUDE_CPPFLAGS_$(VXWORKS_MAJOR_VERSION)) #-------------------------------------------------- # code flags