[dss-commits] r8862 - dss/trunk/examples/plugins/ds485Client

[dss-commits at forum.digitalstrom.org]

Author: pstaehlin
Date: 2009-10-23 13:44:01 +0200 (Fri, 23 Oct 2009)
New Revision: 8862

Modified:
   dss/trunk/examples/plugins/ds485Client/Makefile
   dss/trunk/examples/plugins/ds485Client/webserver_plugin_ds485client.cpp
Log:
Fixed ds485example to run on linux

* Corrected makefile
* Corrected the signature of plugin_handlerequest

Modified: dss/trunk/examples/plugins/ds485Client/Makefile
===================================================================
--- dss/trunk/examples/plugins/ds485Client/Makefile	2009-10-23 09:37:03 UTC (rev 8861)
+++ dss/trunk/examples/plugins/ds485Client/Makefile	2009-10-23 11:44:01 UTC (rev 8862)
@@ -6,7 +6,7 @@
 		g++ -shared -o webserver_plugin_ds485client.so *.o
 		
 
-webserver_plugin_ds485client.so:	webserver_plugin_ds485client.cpp ../../../core/web/plugin/webserver_plugin_ds485client.h
+webserver_plugin_ds485client.so:	webserver_plugin_ds485client.cpp 
 			g++ -I../../../ -g3 -O0 -Wall -fPIC -shared webserver_plugin_ds485client.cpp -o webserver_plugin_ds485client.so
 
 install:	webserver_plugin_ds485client.so

Modified: dss/trunk/examples/plugins/ds485Client/webserver_plugin_ds485client.cpp
===================================================================
--- dss/trunk/examples/plugins/ds485Client/webserver_plugin_ds485client.cpp	2009-10-23 09:37:03 UTC (rev 8861)
+++ dss/trunk/examples/plugins/ds485Client/webserver_plugin_ds485client.cpp	2009-10-23 11:44:01 UTC (rev 8862)
@@ -1,8 +1,8 @@
-#include <cstdlib>
+#include <stdlib.h>
 #include <iostream>
 
+#include "core/web/plugin/webserver_plugin.h" 
 #include "core/base.h"
-#include "core/web/plugin/webserver_plugin.h" 
 #include "core/datetools.h" 
 #include "core/dss.h" 
 #include "core/model.h" 
@@ -16,7 +16,7 @@
   return WEBSERVER_PLUGIN_API_VERSION;
 }
 
-bool plugin_handlerequest(const std::string& _uri, dss::HashMapConstStringString& _parameter, std::string& result) {
+bool plugin_handlerequest(const std::string& _uri, dss::HashMapConstStringString& _parameter, dss::DSS& _dss, std::string& result) {
   std::cout << "in plugin_handlerequest" << std::endl;
   if(endsWith(_uri, "/send")) {
     DS485Client oClient;