diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-07 08:52:40 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-07 08:52:40 +0000 |
| commit | 5d708f9f82fc3480e8b3aebfbd84db53ceee6be8 (patch) | |
| tree | 7f0c847e1ec2f33eb090b5ba84340d768b5ade33 | |
| parent | c2d4a645575439ada976ca0512a0a2fdacb95c30 (diff) | |
| download | ATCD-5d708f9f82fc3480e8b3aebfbd84db53ceee6be8.tar.gz | |
Tue Nov 7 07:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/ace/ACE.h | 4 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_rtems.x_g++.GNU | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index f5e4e8919cf..53daac48966 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Tue Nov 7 07:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ACE.h: + Also rtems defines log2, use the same workaround as with cygwin + + * include/makeinclude/platform_rtems.x_g++.GNU: + Removed -ansi + Tue Nov 7 01:47:46 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> * ace/Sock_Connect.cpp (count_interfaces): diff --git a/ACE/ace/ACE.h b/ACE/ace/ACE.h index fe48ac4803b..7caaadbdaa2 100644 --- a/ACE/ace/ACE.h +++ b/ACE/ace/ACE.h @@ -35,9 +35,9 @@ #include "ace/Sock_Connect.h" #include "ace/Default_Constants.h" -#if defined (CYGWIN32) +#if defined (CYGWIN32) || defined (ACE_HAS_RTEMS) // Include math.h. math.h defines a macro log2 that conflicts with ACE::log2() -// which seems to only cause a problem on cygwin. Insuring that math.h is +// which seems to only cause a problem on cygwin and rtems. Insuring that math.h is // included first solves it since we define acelog2 as log2, then // undefines log2. # include "ace/os_include/os_math.h" diff --git a/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU index 2ee8a18efef..be11cf52f83 100644 --- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU +++ b/ACE/include/makeinclude/platform_rtems.x_g++.GNU @@ -31,8 +31,8 @@ ifeq (no,$(RTEMS_HAS_NETWORKING)) CCFLAGS += -DACE_LACKS_NETWORKING endif -CFLAGS += -specs bsp_specs -qrtems -D_REENTRANT -fasm -ansi -fno-builtin -fno-defer-pop -fvolatile $(PIPE_OPT) -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib -CCFLAGS += -specs bsp_specs -qrtems -D_REENTRANT -fasm -ansi -fno-builtin -fno-defer-pop -fvolatile $(PIPE_OPT) -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib +CFLAGS += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile $(PIPE_OPT) -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib +CCFLAGS += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile $(PIPE_OPT) -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib ifeq (,$(rtti)) CCFLAGS += -fno-rtti -DACE_LACKS_RTTI endif # rtti |