diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2007-01-05 14:03:28 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2007-01-05 14:03:28 +0000 |
| commit | 32be87d1923ff8943482cc1caadcbd09d0891f58 (patch) | |
| tree | 6ac6da30ac65e609c2d00f5eb4f06b9a701cab67 | |
| parent | f817bffe45bc7a1a19aa3bed2bbe7f01425794e6 (diff) | |
| download | ATCD-32be87d1923ff8943482cc1caadcbd09d0891f58.tar.gz | |
ChangeLogTag: Fri Jan 5 14:03:12 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 18 | ||||
| -rw-r--r-- | ACE/apps/JAWS2/HTTPU/http_headers.h | 5 |
2 files changed, 17 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 907b3056fb2..c4921e18baf 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Fri Jan 5 14:03:12 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + + * apps/JAWS2/HTTPU/http_headers.h: + + For the sake of compiling on HP-UX, #undef SERVER if it's defined. + Fri Jan 5 13:34:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_stdio.cpp: @@ -113,17 +119,17 @@ Thu Jan 4 15:33:08 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com> Thu Jan 4 13:53:33 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com> - * ACEXML/tests/Makefile.am: - * ACEXML/tests/util/Makefile.am: - * ACEXML/apps/svcconf/Makefile.am: - * ACEXML/common/Makefile.am: - * ACEXML/examples/SAXPrint/Makefile.am: + * ACEXML/tests/Makefile.am: + * ACEXML/tests/util/Makefile.am: + * ACEXML/apps/svcconf/Makefile.am: + * ACEXML/common/Makefile.am: + * ACEXML/examples/SAXPrint/Makefile.am: Tweak to use ACE_{ZLIB,ZZIP}_{CPPFLAGS,LDFLAGS,LIBS} instead of -I${ZLIB_ROOT}/include, etc. The former are substituted by the configure script. - * m4/ace.m4: + * m4/ace.m4: Add ACE_PATH_ZLIB and ACE_PATH_ZZIP autoconf macros. zlib and zzip can now be enabled at configure time diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.h b/ACE/apps/JAWS2/HTTPU/http_headers.h index 6a937722802..67e423bad83 100644 --- a/ACE/apps/JAWS2/HTTPU/http_headers.h +++ b/ACE/apps/JAWS2/HTTPU/http_headers.h @@ -18,6 +18,11 @@ #include "JAWS/Parse_Headers.h" #include "HTTPU/http_export.h" +// A header file on HP-UX defines SERVER +#if defined (SERVER) +#undef SERVER +#endif /* SERVER */ + class HTTP_Headers; class HTTPU_Export HTTP_Hdr_Node |