diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-05-03 08:33:13 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-05-03 08:33:13 +0000 |
| commit | f609d9ed14ccc43fc437385ff1f7373f22934e57 (patch) | |
| tree | 83eec7269159320d1492511293e66f8be4b59360 | |
| parent | b55bff7111a71124f19d13934ad307c389147fea (diff) | |
| download | ATCD-f609d9ed14ccc43fc437385ff1f7373f22934e57.tar.gz | |
ChangeLogTag:Fri May 3 08:20:53 UTC 2002 Don Hinton <dhinton@ieee.org>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 9 | ||||
| -rw-r--r-- | ace/ace_sys_socket.h | 33 | ||||
| -rw-r--r-- | ace/ace_threads.h | 36 |
5 files changed, 60 insertions, 36 deletions
diff --git a/ChangeLog b/ChangeLog index 5a1fe129a84..331a025d81b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri May 3 08:20:53 UTC 2002 Don Hinton <dhinton@ieee.org> + + * ace/ace_threads.h: + * ace/ace_sys_socket.h: + + Moved some socket specific includes from ace_threads.h to + ace_sys_socket.h, where they belong. Hopefully this will + clear up some of the problems on the sun. + Thu May 2 18:31:31 UTC 2002 Don Hinton <dhinton@ieee.org> * ace/ace_limits.h: Added ace_sys_param.h before definition of MAXNAMELEN. diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 5a1fe129a84..331a025d81b 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,12 @@ +Fri May 3 08:20:53 UTC 2002 Don Hinton <dhinton@ieee.org> + + * ace/ace_threads.h: + * ace/ace_sys_socket.h: + + Moved some socket specific includes from ace_threads.h to + ace_sys_socket.h, where they belong. Hopefully this will + clear up some of the problems on the sun. + Thu May 2 18:31:31 UTC 2002 Don Hinton <dhinton@ieee.org> * ace/ace_limits.h: Added ace_sys_param.h before definition of MAXNAMELEN. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 5a1fe129a84..331a025d81b 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,12 @@ +Fri May 3 08:20:53 UTC 2002 Don Hinton <dhinton@ieee.org> + + * ace/ace_threads.h: + * ace/ace_sys_socket.h: + + Moved some socket specific includes from ace_threads.h to + ace_sys_socket.h, where they belong. Hopefully this will + clear up some of the problems on the sun. + Thu May 2 18:31:31 UTC 2002 Don Hinton <dhinton@ieee.org> * ace/ace_limits.h: Added ace_sys_param.h before definition of MAXNAMELEN. diff --git a/ace/ace_sys_socket.h b/ace/ace_sys_socket.h index ca3f9fb6eca..94122b4f2e1 100644 --- a/ace/ace_sys_socket.h +++ b/ace/ace_sys_socket.h @@ -75,6 +75,39 @@ extern "C" # endif /* ! VXWORKS */ } +// not sure where this should go... +#if !defined (ACE_WIN32) && !defined (ACE_PSOS) +// This part if to avoid STL name conflict with the map structure +// in net/if.h. +# if defined (ACE_HAS_STL_MAP_CONFLICT) +# define map _Resource_Allocation_Map_ +# endif /* ACE_HAS_STL_MAP_CONFLICT */ +# include /**/ <net/if.h> +# if defined (ACE_HAS_STL_MAP_CONFLICT) +# undef map +# endif /* ACE_HAS_STL_MAP_CONFLICT */ + +# if defined (ACE_HAS_STL_QUEUE_CONFLICT) +# define queue _Queue_ +# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ +# include /**/ <netinet/in.h> +# if defined (ACE_HAS_STL_QUEUE_CONFLICT) +# undef queue +# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ + +# 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 */ +#endif /* !ACE_WIN32 && !ACE_PSOS */ + # if defined (SD_RECEIVE) # define ACE_SHUTDOWN_READ SD_RECEIVE # elif defined (SHUT_RD) diff --git a/ace/ace_threads.h b/ace/ace_threads.h index d6397f2d842..573a7ed428a 100644 --- a/ace/ace_threads.h +++ b/ace/ace_threads.h @@ -1112,42 +1112,6 @@ protected: #define ACE_EVENT_T_DEFINED #endif /* ACE_EVENT_T_DEFINED */ - -// not sure where this should go... -#if !defined (ACE_WIN32) && !defined (ACE_PSOS) -// This part if to avoid STL name conflict with the map structure -// in net/if.h. -# if defined (ACE_HAS_STL_MAP_CONFLICT) -# define map _Resource_Allocation_Map_ -# endif /* ACE_HAS_STL_MAP_CONFLICT */ -# include /**/ <net/if.h> -# if defined (ACE_HAS_STL_MAP_CONFLICT) -# undef map -# endif /* ACE_HAS_STL_MAP_CONFLICT */ - -# if defined (ACE_HAS_STL_QUEUE_CONFLICT) -# define queue _Queue_ -# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ -# include /**/ <netinet/in.h> -# if defined (ACE_HAS_STL_QUEUE_CONFLICT) -# undef queue -# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ - - -# 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 */ -#endif /* !ACE_WIN32 && !ACE_PSOS */ - - /** * @class ACE_Thread_ID * |