From 5eac898bfb8867f104690caea105bad06064b65b Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Wed, 25 Jan 2006 19:48:13 +0000
Subject: [PATCH] fixed gcc compiler warnings during unit tests.

---
 bacnet-stack/apdu.c                 | 1 -
 bacnet-stack/bacdcode.c             | 4 ++--
 bacnet-stack/demo/object/device.c   | 1 +
 bacnet-stack/demo/object/device.mak | 1 +
 bacnet-stack/tsm.mak                | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bacnet-stack/apdu.c b/bacnet-stack/apdu.c
index 4d17af5e..f8b35e61 100644
--- a/bacnet-stack/apdu.c
+++ b/bacnet-stack/apdu.c
@@ -122,7 +122,6 @@ bool apdu_service_supported(BACNET_SERVICES_SUPPORTED service_supported)
   int i = 0;
   bool status = false;
   bool found = false;
-  int service = 0;
 
   if (service_supported < MAX_BACNET_SERVICES_SUPPORTED)
   {
diff --git a/bacnet-stack/bacdcode.c b/bacnet-stack/bacdcode.c
index b146da3b..8c7c985c 100644
--- a/bacnet-stack/bacdcode.c
+++ b/bacnet-stack/bacdcode.c
@@ -1678,7 +1678,7 @@ void testBACDCodeSignedValue(Test * pTest, int32_t value)
 {
   uint8_t array[5] = { 0 };
   uint8_t encoded_array[5] = { 0 };
-  long decoded_value = 0;
+  int decoded_value = 0;
   int len = 0, apdu_len = 0;
   uint8_t apdu[MAX_APDU] = { 0 };
   uint8_t tag_number = 0;
@@ -1692,7 +1692,7 @@ void testBACDCodeSignedValue(Test * pTest, int32_t value)
   ct_test(pTest, decoded_value == value);
   if (decoded_value != value)
   {
-    printf("value=%d decoded_value=%ld\n", value, decoded_value);
+    printf("value=%d decoded_value=%d\n", value, decoded_value);
     print_apdu(&array[0],sizeof(array));
   }
   encode_tagged_signed(&encoded_array[0], decoded_value);
diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c
index dd0e237e..be4ed9c6 100644
--- a/bacnet-stack/demo/object/device.c
+++ b/bacnet-stack/demo/object/device.c
@@ -30,6 +30,7 @@
 #include "bacdcode.h"
 #include "bacenum.h"
 #include "config.h" // the custom stuff
+#include "apdu.h"
 #include "ai.h" // object list dependency
 #include "ao.h" // object list dependency
 #include "wp.h" // write property handling
diff --git a/bacnet-stack/demo/object/device.mak b/bacnet-stack/demo/object/device.mak
index 658015f9..6d4609bc 100644
--- a/bacnet-stack/demo/object/device.mak
+++ b/bacnet-stack/demo/object/device.mak
@@ -10,6 +10,7 @@ CFLAGS  = -Wall -I. -Itest -DTEST -DTEST_DEVICE -g
 SRCS = bacdcode.c \
        bigend.c \
        bacstr.c \
+       apdu.c \
        demo/object/device.c \
        test/ctest.c
 
diff --git a/bacnet-stack/tsm.mak b/bacnet-stack/tsm.mak
index 0e853a05..3e9239eb 100644
--- a/bacnet-stack/tsm.mak
+++ b/bacnet-stack/tsm.mak
@@ -1,8 +1,8 @@
 #Makefile to build test case
 CC      = gcc
 # -g for debugging with gdb
-DEFINES = -DTEST -DTEST_TSM
-INCLUDES = -I. -Idemo/object -Itest -Iports/linux
+DEFINES = -DTSM_ENABLED=1 -DTEST -DTEST_TSM
+INCLUDES = -I. -Idemo/object -Idemo/handler -Itest -Iports/linux
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
 SRCS = address.c \