diff options
Diffstat (limited to 'ACE/ace/OS_TLI.h')
| -rw-r--r-- | ACE/ace/OS_TLI.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/ACE/ace/OS_TLI.h b/ACE/ace/OS_TLI.h index 07b8ace2fa2..ab9fb5f3724 100644 --- a/ACE/ace/OS_TLI.h +++ b/ACE/ace/OS_TLI.h @@ -39,20 +39,8 @@ struct t_uderr { }; struct netbuf { }; # else /* !(ACE_HAS_TLI || ACE_HAS_XTI) */ - -# if defined (ACE_HAS_CONFLICTING_XTI_MACROS) - // Make sure tcp.h gets included before sys/xti.h. -# include "ace/os_include/netinet/os_tcp.h" -# undef TCP_NODELAY -# undef TCP_MAXSEG -# endif /* ACE_HAS_CONFLICTING_XTI_MACROS */ - # if defined (ACE_HAS_XTI) -# if defined (ACE_HAS_SYS_XTI_H) /* Nonstandard header placement */ -# define class ace_xti_class -# include /**/ <sys/xti.h> -# undef class -# elif defined (ACE_HAS_FORE_ATM_XTI) +# if defined (ACE_HAS_FORE_ATM_XTI) # include /**/ <fore_xti/xti_user_types.h> # include /**/ <fore_xti/xti.h> # include /**/ <fore_xti/xti_atm.h> @@ -68,7 +56,6 @@ struct netbuf { }; // desired, local or peer, while t_getprotaddr() gets both at once. // t_getname() has values defined for the type, so these aren't defined // for XTI systems. So, define them here for ACE API users to use. - // These values were taken from sys/tiuser.h on Solaris. # if !defined (LOCALNAME) # define LOCALNAME 0 # endif @@ -113,18 +100,6 @@ extern "C" } # endif /* !ACE_HAS_TLI_PROTOTYPES */ -# if defined (ACE_HAS_TIUSER_H) -# include /**/ <tiuser.h> -# else - /* What to do here??? Is there a tli.h? */ -# endif /* ACE_HAS_TIUSER_H */ - -# if defined (ACE_HAS_SVR4_TLI) - // t_getname is a TLI extension added by some platforms before XTI - // was widely available. However, it's not often in the system's - // header files. Sun OS, for example, is like this. - extern "C" int t_getname (int, struct netbuf *, int); -# endif /* ACE_HAS_SVR4_TLI */ # endif /* !ACE_HAS_XTI */ # endif /* ACE_HAS_XTI || ACE_HAS_TLI */ |