diff options
| author | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-27 13:43:36 +0000 |
|---|---|---|
| committer | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-27 13:43:36 +0000 |
| commit | 40056de75a13c2608bb8c7d58e87f56b2cd8ef31 (patch) | |
| tree | b3854f9ae36734eaf2a1c10f356ea2ab5787329c | |
| parent | e5e2f413f7e6bec3ef61a824fbcf1c84896d7490 (diff) | |
| download | ATCD-40056de75a13c2608bb8c7d58e87f56b2cd8ef31.tar.gz | |
ChangeLogTag: Mon Feb 27 07:39:16 2001 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 15 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 15 | ||||
| -rw-r--r-- | ace/OS.h | 8 | ||||
| -rw-r--r-- | ace/config-hpux-11.00.h | 3 | ||||
| -rw-r--r-- | include/makeinclude/platform_hpux_aCC.GNU | 4 |
6 files changed, 58 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 620cd83abdf..c1ef6c91a48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Mon Feb 27 07:39:16 2001 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_hpux_aCC.GNU: + + Removed suppression of Future Error 129. + Removed the use of CFLAGS. + + * ace/OS.h: + * ace/config-hpux-11.00.h: + + Modification to remove system header macro definition conflicts. + This change does not suppress the conflicts, but does an undef + of the two conflicting macros before includeing tcp.h. + Thanks to Sam Chong for reporting this problem. + Mon Feb 26 19:01:16 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/Logging_Strategy.{h,cpp}: Added a new -k option to diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 620cd83abdf..c1ef6c91a48 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,18 @@ +Mon Feb 27 07:39:16 2001 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_hpux_aCC.GNU: + + Removed suppression of Future Error 129. + Removed the use of CFLAGS. + + * ace/OS.h: + * ace/config-hpux-11.00.h: + + Modification to remove system header macro definition conflicts. + This change does not suppress the conflicts, but does an undef + of the two conflicting macros before includeing tcp.h. + Thanks to Sam Chong for reporting this problem. + Mon Feb 26 19:01:16 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/Logging_Strategy.{h,cpp}: Added a new -k option to diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 620cd83abdf..c1ef6c91a48 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,18 @@ +Mon Feb 27 07:39:16 2001 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_hpux_aCC.GNU: + + Removed suppression of Future Error 129. + Removed the use of CFLAGS. + + * ace/OS.h: + * ace/config-hpux-11.00.h: + + Modification to remove system header macro definition conflicts. + This change does not suppress the conflicts, but does an undef + of the two conflicting macros before includeing tcp.h. + Thanks to Sam Chong for reporting this problem. + Mon Feb 26 19:01:16 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/Logging_Strategy.{h,cpp}: Added a new -k option to @@ -3638,6 +3638,14 @@ extern "C" # endif /* ! VXWORKS */ } # if !defined (ACE_LACKS_TCP_H) +# if defined(ACE_HAS_CONFLICTING_XTI_MACROS) +# if defined(TCP_NODELAY) +# undef TCP_NODELAY +# endif +# if defined(TCP_MAXSEG) +# undef TCP_MAXSEG +# endif +# endif # include /**/ <netinet/tcp.h> # endif /* ACE_LACKS_TCP_H */ diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h index 7ad4a081567..9af7e1303db 100644 --- a/ace/config-hpux-11.00.h +++ b/ace/config-hpux-11.00.h @@ -360,6 +360,9 @@ // HP-UX 11 conforms to the XPG4 spec, which ACE calls broken for the // errmsg not being const... #define ACE_HAS_BROKEN_T_ERROR +// The definitions of TCP_NODELAY and TCP_MAXSEG conflict between +// sys/xti.h and netinet/tcp.h. +#define ACE_HAS_CONFLICTING_XTI_MACROS ///////////////////////////////////////////////////////////////////////// // diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU index dbaceb528f4..35e99724c77 100644 --- a/include/makeinclude/platform_hpux_aCC.GNU +++ b/include/makeinclude/platform_hpux_aCC.GNU @@ -59,7 +59,7 @@ endif endif # Suppress warning 302 ((...) parameter list is a non-portable feature) -CCFLAGS += $(CFLAGS) $(THR_DEFS) -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE -w +W302,129 +CCFLAGS += $(THR_DEFS) -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE -w +W302 # If exception support is explicitly disabled, tell the compiler. # This is not recommended since the run-time library can throw exceptions. @@ -75,7 +75,7 @@ endif ifeq ($(word 2,$(HPVERS_WORDS)), 10) CCFLAGS += +W495,667,829 endif -DCFLAGS += -g +DCCFLAGS += -g DLD = $(CXX) $(CCFLAGS) LD = $(CXX) OCCFLAGS = -O |