diff options
| author | Erik Sohns <esohns@users.noreply.github.com> | 2023-01-22 17:38:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-22 17:38:34 +0100 |
| commit | 9e18d338ec598e1a8da6d32a0fba5a20c76978f7 (patch) | |
| tree | 045f42001bd4e15cf8285686798fe47acd2f2b60 /ACE/ace/OS_NS_sys_socket.cpp | |
| parent | 8b6ad82dc91f728cea2c9e86a17e5969a3338fcc (diff) | |
| parent | 8ab31e3e5bb8c09a9c326a54545f4cb475345a78 (diff) | |
| download | ATCD-9e18d338ec598e1a8da6d32a0fba5a20c76978f7.tar.gz | |
Merge branch 'master' into message_queue_ex_get_queue
Diffstat (limited to 'ACE/ace/OS_NS_sys_socket.cpp')
| -rw-r--r-- | ACE/ace/OS_NS_sys_socket.cpp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/ACE/ace/OS_NS_sys_socket.cpp b/ACE/ace/OS_NS_sys_socket.cpp index e7a6a0647bb..0661b44b2b5 100644 --- a/ACE/ace/OS_NS_sys_socket.cpp +++ b/ACE/ace/OS_NS_sys_socket.cpp @@ -104,19 +104,12 @@ ACE_OS::socket_init (int version_high, int version_low) int error = WSAStartup (version_requested, &wsa_data); if (error != 0) -# if defined (ACE_HAS_WINCE) { - ACE_TCHAR fmt[] = ACE_TEXT ("%s failed, WSAGetLastError returned %d"); - ACE_TCHAR buf[80]; // @@ Eliminate magic number. - ACE_OS::snprintf (buf, 80, fmt, ACE_TEXT ("WSAStartup %d"), error); - ::MessageBox (0, buf, ACE_TEXT ("WSAStartup failed!"), MB_OK); + ACE_OS::fprintf (stderr, + "ACE_OS::socket_init; WSAStartup failed, " + "WSAGetLastError returned %d\n", + error); } -# else - ACE_OS::fprintf (stderr, - "ACE_OS::socket_init; WSAStartup failed, " - "WSAGetLastError returned %d\n", - error); -# endif /* ACE_HAS_WINCE */ ACE_OS::socket_initialized_ = 1; } @@ -136,17 +129,10 @@ ACE_OS::socket_fini () if (WSACleanup () != 0) { int error = ::WSAGetLastError (); -# if defined (ACE_HAS_WINCE) - ACE_TCHAR fmt[] = ACE_TEXT ("%s failed, WSAGetLastError returned %d"); - ACE_TCHAR buf[80]; // @@ Eliminate magic number. - ACE_OS::snprintf (buf, 80, fmt, ACE_TEXT ("WSACleanup %d"), error); - ::MessageBox (0, buf , ACE_TEXT ("WSACleanup failed!"), MB_OK); -# else ACE_OS::fprintf (stderr, "ACE_OS::socket_fini; WSACleanup failed, " "WSAGetLastError returned %d\n", error); -# endif /* ACE_HAS_WINCE */ } ACE_OS::socket_initialized_ = 0; } |