diff options
author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-25 14:42:54 +0000 |
---|---|---|
committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-25 14:42:54 +0000 |
commit | 29e02590a06f5d74b94dfc22db86be6b3a632d40 (patch) | |
tree | 082fe5fd6dead414f3d73b71b490690227cac34a /navit/support | |
parent | 10d3d0fe26721a499b7c1372ac08ecd4f30a83c9 (diff) | |
download | navit-svn-29e02590a06f5d74b94dfc22db86be6b3a632d40.tar.gz |
Fix:support_win32:MSVC fixes|Thanks chollya
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4013 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/support')
-rw-r--r-- | navit/support/win32/serial_io.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/navit/support/win32/serial_io.c b/navit/support/win32/serial_io.c index 643201c5..a1cc77fe 100644 --- a/navit/support/win32/serial_io.c +++ b/navit/support/win32/serial_io.c @@ -20,6 +20,8 @@ int serial_io_init( const char* port, const char* strsettings ) { HANDLE hCom = NULL; + DCB dcb; + COMMTIMEOUTS sCT; char strport[16]; snprintf( strport, sizeof( strport ), "\\\\.\\%s", port ); @@ -54,8 +56,6 @@ int serial_io_init( const char* port, const char* strsettings ) return -1; } - DCB dcb; - ZeroMemory(&dcb, sizeof(DCB)); GetCommState(hCom, &dcb); @@ -66,8 +66,6 @@ int serial_io_init( const char* port, const char* strsettings ) SetCommState(hCom, &dcb); - COMMTIMEOUTS sCT; - memset(&sCT, 0, sizeof(sCT)); sCT.ReadTotalTimeoutConstant = 10; @@ -94,9 +92,9 @@ int serial_io_init( const char* port, const char* strsettings ) **/ int serial_io_read( int fd, char * buffer, int buffer_size ) { + DWORD dwBytesIn = 0; dbg(1, "serial_io_read fd = %d buffer_size = %d\n", fd, buffer_size); - DWORD dwBytesIn = 0; if (fd <= 0) { @@ -139,9 +137,9 @@ int serial_io_read( int fd, char * buffer, int buffer_size ) **/ int serial_io_write(int fd, const char * buffer) { + DWORD dwBytesOut = 0; dbg(1, "serial_io_write fd = %d buffer = '%s'\n",fd, buffer); - DWORD dwBytesOut = 0; WriteFile((HANDLE)fd, buffer, strlen(buffer), &dwBytesOut, NULL); |