From 9fb6b9107ab3dc9340313b9c77723bb4d6ca917b Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Mon, 9 Dec 2013 20:31:47 +0000
Subject: [PATCH] Fixed various compiler warnings.  Thank you, Morten
 Kvistgaard!

---
 bacnet-stack/demo/handler/s_ptransfer.c | 8 ++++++++
 bacnet-stack/demo/object/trendlog.c     | 4 ++--
 bacnet-stack/demo/ptransfer/main.c      | 5 ++---
 bacnet-stack/ports/win32/bip-init.c     | 2 ++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/bacnet-stack/demo/handler/s_ptransfer.c b/bacnet-stack/demo/handler/s_ptransfer.c
index 0720120f..d1663c29 100644
--- a/bacnet-stack/demo/handler/s_ptransfer.c
+++ b/bacnet-stack/demo/handler/s_ptransfer.c
@@ -47,6 +47,14 @@
 
 /** @file s_ptransfer.c  Send a Private Transfer request. */
 
+/* This function is exported. Hence this unnecessary prototype. */
+uint8_t Send_Private_Transfer_Request(
+    uint32_t device_id,
+    uint16_t vendor_id,
+    uint32_t service_number,
+    char block_number,
+    DATABLOCK * block);
+
 uint8_t Send_Private_Transfer_Request(
     uint32_t device_id,
     uint16_t vendor_id,
diff --git a/bacnet-stack/demo/object/trendlog.c b/bacnet-stack/demo/object/trendlog.c
index c48f78ef..e7032701 100644
--- a/bacnet-stack/demo/object/trendlog.c
+++ b/bacnet-stack/demo/object/trendlog.c
@@ -1670,8 +1670,8 @@ void TL_fetch_property(
 {
     uint8_t ValueBuf[MAX_APDU]; /* This is a big buffer in case someone selects the device object list for example */
     uint8_t StatusBuf[3];       /* Should be tag, bits unused in last octet and 1 byte of data */
-    BACNET_ERROR_CLASS error_class;
-    BACNET_ERROR_CODE error_code;
+    BACNET_ERROR_CLASS error_class = 0;
+    BACNET_ERROR_CODE error_code = ERROR_CODE_SUCCESS;
     int iLen;
     uint8_t ucCount;
     TL_LOG_INFO *CurrentLog;
diff --git a/bacnet-stack/demo/ptransfer/main.c b/bacnet-stack/demo/ptransfer/main.c
index 7e5202fb..47e7624c 100644
--- a/bacnet-stack/demo/ptransfer/main.c
+++ b/bacnet-stack/demo/ptransfer/main.c
@@ -62,7 +62,7 @@
 #define _stricmp stricmp
 #endif
 
-uint8_t Send_Private_Transfer_Request(
+extern uint8_t Send_Private_Transfer_Request(
     uint32_t device_id,
     uint16_t vendor_id,
     uint32_t service_number,
@@ -176,7 +176,6 @@ int main(
     int iCount = 0;
     int iType = 0;
     int iKey;
-    static int iLimit[3] = { 7, 11, 7 };
 
     if (((argc != 2) && (argc != 3)) || ((argc >= 2) &&
             (strcmp(argv[1], "--help") == 0))) {
@@ -300,7 +299,7 @@ int main(
                             NewData.cMyByte1 = iCount;
                             NewData.cMyByte2 = 255 - iCount;
                             NewData.fMyReal = (float) iCount;
-                            strcpy(NewData.sMyString, "Test Data - [x]");
+                            strcpy((char*)NewData.sMyString, "Test Data - [x]");
                             NewData.sMyString[13] = 'a' + iCount;
                             printf("Sending block %d\n", iCount);
                             invoke_id =
diff --git a/bacnet-stack/ports/win32/bip-init.c b/bacnet-stack/ports/win32/bip-init.c
index 87679013..d42c2b2f 100644
--- a/bacnet-stack/ports/win32/bip-init.c
+++ b/bacnet-stack/ports/win32/bip-init.c
@@ -42,8 +42,10 @@
 #include "bip.h"
 #include "net.h"
 
+#if defined(_MSC_VER)
 #pragma comment(lib, "Ws2_32.lib")
 #pragma comment(lib, "IPHLPAPI.lib")
+#endif
 
 bool BIP_Debug = false;