From 2b7e65076a35e87c766ddc4754e77283348074b0 Mon Sep 17 00:00:00 2001 From: dhinton Date: Mon, 6 May 2002 10:20:07 +0000 Subject: ChangeLogTag:Mon May 6 09:33:00 UTC 2002 Don Hinton --- ace/Handle_Set.i | 1 + ace/Object_Manager_Base.h | 1 + ace/Sched_Params.cpp | 4 ++++ ace/TLI_Acceptor.cpp | 1 + ace/TLI_Stream.i | 1 + ace/ace_limits.h | 25 +++++++++++++------------ ace/ace_signal.h | 9 ++++----- ace/ace_stdio.h | 22 ++++++++++++---------- ace/ace_sys_types.h | 4 ---- 9 files changed, 37 insertions(+), 31 deletions(-) diff --git a/ace/Handle_Set.i b/ace/Handle_Set.i index dfc4b3b1068..58b9f62d6e3 100644 --- a/ace/Handle_Set.i +++ b/ace/Handle_Set.i @@ -5,6 +5,7 @@ #include "ace/Trace.h" #include /**/ +#include "ace/ace_string.h" // FD_ZERO seems to use memset on sun // Initialize the bitmask to all 0s and reset the associated fields. diff --git a/ace/Object_Manager_Base.h b/ace/Object_Manager_Base.h index b678e5a4f81..eaaf2d7ff66 100644 --- a/ace/Object_Manager_Base.h +++ b/ace/Object_Manager_Base.h @@ -23,6 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/ace_sys_types.h" +#include "ace/ace_signal.h" #include "ace/OS_Export.h" #include "ace/Global_Macros.h" diff --git a/ace/Sched_Params.cpp b/ace/Sched_Params.cpp index e61fd0338f8..357fcce7ee4 100644 --- a/ace/Sched_Params.cpp +++ b/ace/Sched_Params.cpp @@ -22,6 +22,10 @@ #include "ace/Sched_Params.i" #endif /* __ACE_INLINE__ */ +#if defined (ACE_HAS_PRIOCNTL) && defined (ACE_HAS_STHREADS) +# include "ace/OS_String.h" +#endif /* ACE_HAS_PRIOCNTL && ACE_HAS_STHREADS */ + ACE_RCSID(ace, Sched_Params, "$Id$") int diff --git a/ace/TLI_Acceptor.cpp b/ace/TLI_Acceptor.cpp index b38cd19820a..1501952ad74 100644 --- a/ace/TLI_Acceptor.cpp +++ b/ace/TLI_Acceptor.cpp @@ -6,6 +6,7 @@ ACE_RCSID(ace, TLI_Acceptor, "$Id$") #if defined (ACE_HAS_TLI) +# include "ace/ACE.h" // Put the actual definitions of the ACE_TLI_Request and // ACE_TLI_Request_Queue classes here to hide them from clients... diff --git a/ace/TLI_Stream.i b/ace/TLI_Stream.i index 8452138cea1..a4db190cc8c 100644 --- a/ace/TLI_Stream.i +++ b/ace/TLI_Stream.i @@ -4,6 +4,7 @@ // TLI_Stream.i #include "ace/TLI_Stream.h" +#include "ace/ACE.h" ACE_INLINE ssize_t diff --git a/ace/ace_limits.h b/ace/ace_limits.h index 1b1645be4b3..1e307c9e334 100644 --- a/ace/ace_limits.h +++ b/ace/ace_limits.h @@ -25,18 +25,19 @@ # include /**/ # endif /* ACE_LACKS_LIMITS_H */ -#if !defined (L_cuserid) -# if !defined (ACE_L_CUSERID) -# define ACE_L_CUSERID 9 - // 8 character user ID + NULL -# endif /* !ACE_L_CUSERID */ -# define L_cuserid ACE_L_CUSERID -# endif /* L_cuserid */ - -// need to fix this -# if !defined ACE_MAX_USERID -# define ACE_MAX_USERID L_cuserid -# endif /* !ACE_MAX_USERID */ +// If we still have a problem with this, it can be put in a new +// file, e.g., ace_xopen_lim.h, that can be included by both ace_stdio.h +// and ace_limits.h +// This is defined by XOPEN to be a minimum of 16. POSIX.1g +// also defines this value. platform-specific config.h can +// override this if need be. +# if !defined (IOV_MAX) +# define IOV_MAX 16 +# endif /* IOV_MAX */ + +# if !defined (ACE_IOV_MAX) +# define ACE_IOV_MAX IOV_MAX +# endif /* ACE_IOV_MAX */ // Need this before MAXNAMELEN--does it belong here? #include "ace/ace_sys_param.h" diff --git a/ace/ace_signal.h b/ace/ace_signal.h index a448d99044f..ea21a0864de 100644 --- a/ace/ace_signal.h +++ b/ace/ace_signal.h @@ -176,8 +176,6 @@ typedef void (*ACE_Sig_Handler_Ex) (int, siginfo_t *siginfo, ucontext_t *ucontex # endif /* __rtems__ */ # endif /* ! DIGITAL_UNIX && ! ACE_HAS_SIGWAIT */ - - # if defined (ACE_LACKS_SIGACTION_T) struct sigaction { @@ -187,6 +185,10 @@ struct sigaction }; # endif /* ACE_LACKS_SIGACTION_T */ +# if defined (ACE_LACKS_SIGSET_T) +typedef u_int sigset_t; +# endif /* ACE_LACKS_SIGSET_T */ + # if !defined (SIGHUP) # define SIGHUP 0 # endif /* SIGHUP */ @@ -255,7 +257,6 @@ struct sigaction # endif # endif /* SIG_ERR */ - # if !defined (SIG_BLOCK) # define SIG_BLOCK 1 # endif /* SIG_BLOCK */ @@ -268,8 +269,6 @@ struct sigaction # define SIG_SETMASK 3 # endif /* SIG_SETMASK */ - - # if defined (__Lynx__) // LynxOS Neutrino sets NSIG to the highest-numbered signal. # define ACE_NSIG (NSIG + 1) diff --git a/ace/ace_stdio.h b/ace/ace_stdio.h index 2c756a713e2..6b75b5cc67b 100644 --- a/ace/ace_stdio.h +++ b/ace/ace_stdio.h @@ -39,16 +39,18 @@ # define ACE_SPRINTF_ADAPTER(X) X # endif /* ACE_HAS_CHARPTR_SPRINTF */ -// This is defined by XOPEN to be a minimum of 16. POSIX.1g -// also defines this value. platform-specific config.h can -// override this if need be. -# if !defined (IOV_MAX) -# define IOV_MAX 16 -# endif /* IOV_MAX */ - -# if !defined (ACE_IOV_MAX) -# define ACE_IOV_MAX IOV_MAX -# endif /* ACE_IOV_MAX */ +#if !defined (L_cuserid) +# if !defined (ACE_L_CUSERID) +# define ACE_L_CUSERID 9 + // 8 character user ID + NULL +# endif /* !ACE_L_CUSERID */ +# define L_cuserid ACE_L_CUSERID +# endif /* L_cuserid */ + +// need to fix this? +# if !defined ACE_MAX_USERID +# define ACE_MAX_USERID L_cuserid +# endif /* !ACE_MAX_USERID */ #if !defined (ACE_WIN32) // Honestly don't know where these should go. diff --git a/ace/ace_sys_types.h b/ace/ace_sys_types.h index 20af2085c53..523ec7ec34a 100644 --- a/ace/ace_sys_types.h +++ b/ace/ace_sys_types.h @@ -166,10 +166,6 @@ typedef u_long rlim_t; typedef int sig_atomic_t; # endif /* ACE_LACKS_SIG_ATOMIC_T */ -# if defined (ACE_LACKS_SIGSET_T) -typedef u_int sigset_t; -# endif /* ACE_LACKS_SIGSET_T */ - # if defined (ACE_LACKS_SIZE_T) typedef u_int size_t; # endif /* ACE_LACKS_SIZE_T */ -- cgit v1.2.1