Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows: Supporting Serial Port #1838

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ACE/ace/README
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ ACE_TLI_TCP_DEVICE Device the platform uses for TCP on
TLI. Only needed if not /dev/tcp.
ACE_USE_POLL The OS platform supports the
poll() event demultiplexor
ACE_USE_WIN32_WRITE_FILE Uses WriteFile instead of WSASend. This works for
serial Ports (COM1...)
ACE_USES_ASM_SYMBOL_IN_DLSYM Platform uses assembly symbols
instead of C symbols in
dlsym()
Expand Down
2 changes: 1 addition & 1 deletion ACE/ace/WIN32_Asynch_IO.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ ACE_WIN32_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
// Initiate the write; Winsock 2 is required for the higher-performing
// WSASend() function. For Winsock 1, fall back to the slower WriteFile().
int initiate_result = 0;
#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && !(defined(ACE_USE_WIN32_WRITE_FILE))
WSABUF iov;
iov.buf = result->message_block ().rd_ptr ();
iov.len = static_cast<DWORD> (bytes_to_write);
Expand Down