From 02a0554ed841de581a2d5a6b6d2bbac521bda38c Mon Sep 17 00:00:00 2001 From: skarg Date: Thu, 11 Oct 2007 18:17:38 +0000 Subject: [PATCH] Corrected warnings and errors for Linux compile. --- bacnet-stack/demo/epics/Makefile | 4 +--- bacnet-stack/demo/epics/main.c | 3 --- bacnet-stack/demo/server/Makefile | 3 ++- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/bacnet-stack/demo/epics/Makefile b/bacnet-stack/demo/epics/Makefile index 07790b81..a33ac418 100644 --- a/bacnet-stack/demo/epics/Makefile +++ b/bacnet-stack/demo/epics/Makefile @@ -24,9 +24,7 @@ LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) -SRCS = main.c \ - $(BACNET_ROOT)/key.c \ - $(BACNET_ROOT)/keylist.c +SRCS = main.c OBJS = ${SRCS:.c=.o} diff --git a/bacnet-stack/demo/epics/main.c b/bacnet-stack/demo/epics/main.c index 54a9dd41..4125efa4 100644 --- a/bacnet-stack/demo/epics/main.c +++ b/bacnet-stack/demo/epics/main.c @@ -58,9 +58,6 @@ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; static uint32_t Target_Device_Object_Instance = BACNET_MAX_INSTANCE; static bool Error_Detected = false; static BACNET_ADDRESS Target_Address; -/* use this parameter to set a special interface: - "eth0" on Linux, or dotted IP address on Windows */ -static char *Network_Interface = NULL; typedef struct BACnet_RP_Service_Data_t { bool new_data; diff --git a/bacnet-stack/demo/server/Makefile b/bacnet-stack/demo/server/Makefile index 89b103ea..c5a993ff 100644 --- a/bacnet-stack/demo/server/Makefile +++ b/bacnet-stack/demo/server/Makefile @@ -16,7 +16,8 @@ DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories BACNET_PORT = ../../ports/linux BACNET_INCLUDE = ../../include - BACnet Library + +# BACnet Library BACNET_LIB_DIR = ../../lib BACNET_LIB_NAME = bacnet BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a