diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-06-15 13:24:16 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-06-15 13:24:16 +0000 |
| commit | 88fc0a727e40229f2c91b491ef359caf4eb4c38e (patch) | |
| tree | 81aa9e57534e53bd405d6fdf8cca52b197675717 | |
| parent | 4bcb914c56e7ec1f85f0450774081551e3f58b6d (diff) | |
| download | ATCD-88fc0a727e40229f2c91b491ef359caf4eb4c38e.tar.gz | |
Sun Jun 15 13:23:13 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 14 | ||||
| -rw-r--r-- | ACE/ace/Strategies_T.h | 2 | ||||
| -rw-r--r-- | ACE/ace/config-linux-common.h | 1 | ||||
| -rw-r--r-- | ACE/rpmbuild/ace-tao-strrecvfd.patch | 10 | ||||
| -rw-r--r-- | ACE/rpmbuild/ace-tao.spec | 3 |
5 files changed, 16 insertions, 14 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index ea30fe21eb5..8290f1f7e77 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,17 @@ +Sun Jun 15 13:23:13 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-linux-common.h: + Added ACE_LACKS_STRRECVFD when no streams are available (like fc9) + + * rpmbuild/ace-tao-strrecvfd.patch: + Deleted + + * rpmbuild/ace-tao.spec: + Patch 6 is not needed anymore + + * ace/Strategies_T.h: + Doxygen change + Sun Jun 15 03:08:53 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> * ace/Monitor_Control/Monitor_Control.mpc: diff --git a/ACE/ace/Strategies_T.h b/ACE/ace/Strategies_T.h index 23d99703c3e..4acb9411d98 100644 --- a/ACE/ace/Strategies_T.h +++ b/ACE/ace/Strategies_T.h @@ -383,7 +383,7 @@ public: // = Factory method. /** - * Activate the <svc_handler> with an appropriate concurrency + * Activate the @a svc_handler with an appropriate concurrency * strategy. This method activates the SVC_HANDLER by first calling * its <open> method and then calling its <activate> method to turn * it into an active object. diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index 4a6b4f3ba96..ed466fc1eb8 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -368,6 +368,7 @@ // this define is set #if defined _XOPEN_STREAMS && _XOPEN_STREAMS == -1 # define ACE_LACKS_STROPTS_H +# define ACE_LACKS_STRRECVFD #endif #if !defined (ACE_LACKS_STROPTS_H) diff --git a/ACE/rpmbuild/ace-tao-strrecvfd.patch b/ACE/rpmbuild/ace-tao-strrecvfd.patch deleted file mode 100644 index f4261ebe859..00000000000 --- a/ACE/rpmbuild/ace-tao-strrecvfd.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ACE_wrappers/ace/config-linux-common.h~ 2008-05-15 05:53:03.000000000 -0700 -+++ ACE_wrappers/ace/config-linux-common.h 2008-06-02 01:36:45.000000000 -0700 -@@ -368,6 +368,7 @@ - // this define is set - #if defined _XOPEN_STREAMS && _XOPEN_STREAMS == -1 - # define ACE_LACKS_STROPTS_H -+# define ACE_LACKS_STRRECVFD - #endif - - #if !defined (ACE_LACKS_STROPTS_H) diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index 8233a4adb2e..b3232ccaa4b 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -47,7 +47,6 @@ Source0: http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-%{ACE ## Patch0: ace-tao-config.patch ## Patch4: ace-tao-gperf-info.patch ## Patch5: ace-tao-orbsvcs-daemon.patch -## Patch6: ace-tao-strrecvfd.patch ## Patch7: ace-tao-unusedarg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -626,8 +625,6 @@ export CIAO_ROOT=$TAO_ROOT/CIAO cat ${ACE_ROOT}/rpmbuild/ace-tao-gperf-info.patch | patch -p 1 #patch5 -p 1 cat ${ACE_ROOT}/rpmbuild/ace-tao-orbsvcs-daemon.patch | patch -p 1 -#%patch6 -p 1 -cat ${ACE_ROOT}/rpmbuild/ace-tao-strrecvfd.patch | patch -p 1 #%patch7 -p 1 cat ${ACE_ROOT}/rpmbuild/ace-tao-unusedarg.patch | patch -p 1 |