From ea2f8af4daf7aebce4fd78e77cb9bd5bf9c2733e Mon Sep 17 00:00:00 2001
From: Thomas Pedersen <tp@cs.aau.dk>
Date: Wed, 7 May 2014 18:58:56 +0200
Subject: [PATCH] Fix a few bugs

---
 OperationHandler/homeport/include/CMakeLists.txt | 6 +++---
 OperationHandler/homeport/src/homeport.c         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OperationHandler/homeport/include/CMakeLists.txt b/OperationHandler/homeport/include/CMakeLists.txt
index c2e3fb2b..a92d7f12 100644
--- a/OperationHandler/homeport/include/CMakeLists.txt
+++ b/OperationHandler/homeport/include/CMakeLists.txt
@@ -38,7 +38,7 @@ install (FILES ../../REST/libREST/include/libREST.h DESTINATION include/hpdaemon
 install (FILES ../../../misc/include/utlist.h DESTINATION include/hpdaemon)
 install (FILES ../../../misc/include/idgen.h DESTINATION include/hpdaemon)
 #install (FILES hpd_configure.h DESTINATION include/hpdaemon)
-#install (FILES ../../http-webserver/include/http_types.h DESTINATION include/hpdaemon)
-#install (FILES ../../webserver/include/ws_types.h DESTINATION include/hpdaemon)
-#install (FILES ../../misc/include/linkedmap.h DESTINATION include/hpdaemon)
+install (FILES ../../REST/http-webserver/include/http_types.h DESTINATION include/hpdaemon)
+install (FILES ../../REST/webserver/include/ws_types.h DESTINATION include/hpdaemon)
+install (FILES ../../../misc/include/linkedmap.h DESTINATION include/hpdaemon)
 
diff --git a/OperationHandler/homeport/src/homeport.c b/OperationHandler/homeport/src/homeport.c
index f9d37cb8..a034a0ef 100644
--- a/OperationHandler/homeport/src/homeport.c
+++ b/OperationHandler/homeport/src/homeport.c
@@ -48,7 +48,7 @@ char *timestamp ( void );
 char* stateToXml(char *state);
 char* xmlToState(char *xml);
 char* stateToJson(char *state);
-const char* jsonToState(char *xml);
+char* jsonToState(char *xml);
 static void sig_cb ( struct ev_loop *loop, struct ev_signal *w, int revents );
 char* generateUri( Device *device, Service *service );