diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-07-19 20:17:09 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-07-19 20:17:09 +0000 |
| commit | 80012f8bf8032f0c28e4e5ca02d4672370a25137 (patch) | |
| tree | ea06d543ffc8e066ccfbaf96a8be8a7ca0e6461a /ACE/examples/Service_Configurator | |
| parent | 10d279d3172a275f5f53fb18d4a0945f589a7224 (diff) | |
| download | ATCD-saic_android.tar.gz | |
Tue Jul 19 20:15:51 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>saic_android
* ace/config-android.h:
* examples/APG/ThreadManagement/Async_Cancel.cpp:
* examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp:
* examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl:
* examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl:
* examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp:
* examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp:
* include/makeinclude/platform_android.GNU:
* tests/Logging_Strategy_Test.cpp:
* tests/Thread_Attrs_Test.cpp:
Various android fixes.
Diffstat (limited to 'ACE/examples/Service_Configurator')
4 files changed, 18 insertions, 0 deletions
diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp index c4b3944b26f..fe572822c3c 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp @@ -92,7 +92,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -1); char name[ACE_MAX_USERID]; + +#ifndef ACE_LACKS_CUSERID ACE_OS::cuserid (name); +#else + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error: ::cuserid is not supported on this platform\n")), + -1); +#endif if (sd.send (name, ACE_OS::strlen (name) + 1, diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl index 03b87ef905c..b82dadd9278 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl @@ -15,8 +15,12 @@ Handle_L_Stream::~Handle_L_Stream (void) ACE_INLINE Handle_L_Stream::Handle_L_Stream (void) { +#ifndef ACE_LACKS_CUSERID if (Handle_L_Stream::login_name == 0) Handle_L_Stream::login_name = ACE_OS::cuserid (Handle_L_Stream::login); +#else + ACE_ERROR ((LM_ERROR, "Error: cuserid is not supported on this platform")); +#endif } ACE_INLINE int diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl index 2a9d9f84fdd..5509dbdcb0a 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl @@ -12,8 +12,12 @@ ACE_INLINE Handle_R_Stream::Handle_R_Stream (void) { +#ifndef ACE_LACKS_CUSERID if (Handle_R_Stream::login_name == 0) Handle_R_Stream::login_name = ACE_OS::cuserid (Handle_R_Stream::login); +#else + ACE_ERROR ((LM_ERROR, "Error: cuserid is not supported on this platform")); +#endif } ACE_INLINE int diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp index f5b952ca7a1..d51ac01f923 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp @@ -158,7 +158,11 @@ CLI_Stream<PR_ST_2>::svc (void) ACE_OS::fflush (stdout); time_t t = ACE_OS::time (0L); +#ifndef ACE_LACKS_CUSERID ACE_OS::cuserid (login_name); +#else + ACE_ERROR ((LM_ERROR, "Error: cuserid is not supported on this platform")); +#endif ACE_OS::sprintf (buf, "user %s %s", login_name, |