diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-01-08 15:46:23 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-01-08 15:46:23 +0000 |
| commit | 2a80055f373159bf62db8ec675f3c6c569e9d0f8 (patch) | |
| tree | 9faea48296d1bd63cb3b551cd265a9607c1b4e9a | |
| parent | adc30fa403cc76a084422f5b7e2aab2450e871ec (diff) | |
| download | ATCD-2a80055f373159bf62db8ec675f3c6c569e9d0f8.tar.gz | |
ChangeLogTag:Sat Jan 8 09:44:51 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 10 | ||||
| -rw-r--r-- | TAO/tao/default_resource.cpp | 10 | ||||
| -rw-r--r-- | ace/OS.i | 4 |
5 files changed, 33 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 1f8f429d940..7802d35ecda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,21 @@ +Sat Jan 8 09:44:51 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/OS.i: Needed to add an extern "C" {} block around the + setregid() and setreuid() functions. Thanks to David Levine + for reporting this. + Fri Jan 7 20:01:48 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/OS.i, ace/config-sunos5.5.h: Some platforms seem to lack function - prototypes for setreuid() and setreguid(), even though they are + prototypes for setreuid() and setregid(), even though they are in the library. Therefore, I've added #define ACE_LACKS_SETREGID_PROTOTYPE and - #define ACE_LACKS_SETREGID_PROTOTYPE + #define ACE_LACKS_SETREUID_PROTOTYPE macros to handle this case. diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 1f8f429d940..7802d35ecda 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,15 +1,21 @@ +Sat Jan 8 09:44:51 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/OS.i: Needed to add an extern "C" {} block around the + setregid() and setreuid() functions. Thanks to David Levine + for reporting this. + Fri Jan 7 20:01:48 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/OS.i, ace/config-sunos5.5.h: Some platforms seem to lack function - prototypes for setreuid() and setreguid(), even though they are + prototypes for setreuid() and setregid(), even though they are in the library. Therefore, I've added #define ACE_LACKS_SETREGID_PROTOTYPE and - #define ACE_LACKS_SETREGID_PROTOTYPE + #define ACE_LACKS_SETREUID_PROTOTYPE macros to handle this case. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 1f8f429d940..7802d35ecda 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,15 +1,21 @@ +Sat Jan 8 09:44:51 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/OS.i: Needed to add an extern "C" {} block around the + setregid() and setreuid() functions. Thanks to David Levine + for reporting this. + Fri Jan 7 20:01:48 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/OS.i, ace/config-sunos5.5.h: Some platforms seem to lack function - prototypes for setreuid() and setreguid(), even though they are + prototypes for setreuid() and setregid(), even though they are in the library. Therefore, I've added #define ACE_LACKS_SETREGID_PROTOTYPE and - #define ACE_LACKS_SETREGID_PROTOTYPE + #define ACE_LACKS_SETREUID_PROTOTYPE macros to handle this case. diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 57563e25cea..5fdafe32c44 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -714,9 +714,9 @@ ACE_FACTORY_DEFINE (TAO, TAO_Default_Resource_Factory) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX>; -template class ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX, ACE_Control_Block>; -template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> >; +template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>; +template class ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>; +template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX> >; template class ACE_Select_Reactor_Token_T<ACE_Noop_Token>; template class ACE_Lock_Adapter<ACE_Select_Reactor_Token_T<ACE_Noop_Token> >; @@ -724,8 +724,8 @@ template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX, ACE_Control_Block> +#pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block> #pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> > #pragma instantiate ACE_Select_Reactor_Token_T<ACE_Noop_Token> @@ -50,11 +50,15 @@ typedef const char *ACE_SOCKOPT_TYPE1; #endif /* ACE_HAS_VOIDPTR_SOCKOPT */ #if defined (ACE_LACKS_SETREUID_PROTOTYPE) +extern "C" { extern int setreuid (uid_t ruid, uid_t euid); +} #endif /* ACE_LACKS_SETREUID_PROTOTYPE */ #if defined (ACE_LACKS_SETREGID_PROTOTYPE) +extern "C" { extern int setregid (gid_t rgid, gid_t egid); +} #endif /* ACE_LACKS_SETREGID_PROTOTYPE */ #if defined (ACE_LACKS_WRITEV) |