From 624de45fc86ba2a9e8fe3e1d754b0a30ac78c38a Mon Sep 17 00:00:00 2001 From: skarg Date: Fri, 14 Jan 2011 15:23:03 +0000 Subject: [PATCH] Cleaned up compiler warnings when compiled with Win32 MS/TP datalink. --- bacnet-stack/demo/handler/s_cevent.c | 1 + bacnet-stack/ports/win32/dlmstp.c | 8 +++++--- bacnet-stack/ports/win32/rs485.c | 3 ++- bacnet-stack/src/mstptext.c | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bacnet-stack/demo/handler/s_cevent.c b/bacnet-stack/demo/handler/s_cevent.c index 6ba75e17..0607d718 100644 --- a/bacnet-stack/demo/handler/s_cevent.c +++ b/bacnet-stack/demo/handler/s_cevent.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "event.h" #include "device.h" #include "datalink.h" diff --git a/bacnet-stack/ports/win32/dlmstp.c b/bacnet-stack/ports/win32/dlmstp.c index 4687b71f..fb4a3e91 100644 --- a/bacnet-stack/ports/win32/dlmstp.c +++ b/bacnet-stack/ports/win32/dlmstp.c @@ -28,7 +28,9 @@ #include #include #include +#ifdef __BORLANDC__ #include +#endif #include "bacdef.h" #include "bacaddr.h" #include "mstp.h" @@ -82,13 +84,13 @@ static void Timer_Silence_Reset( SilenceTime = 0; } -void dlmstp_millisecond_timer( +static void dlmstp_millisecond_timer( void) { INCREMENT_AND_LIMIT_UINT16(SilenceTime); } -void dlmstp_reinit( +static void dlmstp_reinit( void) { /*RS485_Reinit(); */ @@ -321,7 +323,7 @@ uint16_t MSTP_Get_Send( return pdu_len; } -bool dlmstp_compare_data_expecting_reply( +static bool dlmstp_compare_data_expecting_reply( uint8_t * request_pdu, uint16_t request_pdu_len, uint8_t src_address, diff --git a/bacnet-stack/ports/win32/rs485.c b/bacnet-stack/ports/win32/rs485.c index b25c5078..de48c1d0 100644 --- a/bacnet-stack/ports/win32/rs485.c +++ b/bacnet-stack/ports/win32/rs485.c @@ -53,6 +53,7 @@ #define WIN32_LEAN_AND_MEAN #define STRICT 1 #include +#include "rs485.h" /* details from Serial Communications in Win32 at MSDN */ @@ -89,7 +90,7 @@ static DWORD RS485_RTSControl = RTS_CONTROL_DISABLE; * ALGORITHM: none * NOTES: none *****************************************************************************/ -void strupper( +static void strupper( char *str) { char *p; diff --git a/bacnet-stack/src/mstptext.c b/bacnet-stack/src/mstptext.c index a98dd726..5ffec65e 100644 --- a/bacnet-stack/src/mstptext.c +++ b/bacnet-stack/src/mstptext.c @@ -35,6 +35,7 @@ #include "mstp.h" #include "indtext.h" #include "bacenum.h" +#include "mstptext.h" /** @file mstptext.c Text mapping functions for BACnet MS/TP */