Fix compilation for target

[staging/windowmanager.git] / AFBClient.h

diff --git a/AFBClient.h b/AFBClient.h
index 6947629..fa88663 100644 (file)
--- a/AFBClient.h
+++ b/AFBClient.h
@@ -4,10 +4,13 @@
 #include <systemd/sd-event.h>
 
 #ifdef AFB
+extern "C"
+{
 #include <json-c/json.h>
 
 #include "afb-wsj1.h"
 #include "afb-ws-client.h"
+}
 #endif
 
 class AFBClient
@@ -20,19 +23,22 @@ public:
     void deactivateSurface(const char *label);
     void endDraw(const char *label);
 
+    static void onCall(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg);
+    static void onEvent(void *closure, const char *event, struct afb_wsj1_msg *msg);
+    static void onHangup(void *closure, struct afb_wsj1 *wsj1);
+    static void onReply(void *closure, struct afb_wsj1_msg *msg);
+
 private:
     void call(const char *api, const char *verb, const char *object);
     void emitSignalOrCall(const char *api, const char *verb, const char *object);
     void event(const char *event, const char *object);
-    void onCall(void *closure, struct afb_wsj1 *wsj1);
-    void onEvent(void *closure, const char *event, struct afb_wsj1_msg *msg);
-    void onHangup(void *closure, struct afb_wsj1 *wsj1);
-    void onReply(void *closure, struct afb_wsj1_msg *msg);
 
     struct afb_wsj1 *wsj1;
+    struct afb_wsj1_itf itf;
+
     sd_event *loop;
-    const char *wmURI = "ws://localhost:1700/api?wm";
-    const char *wmAPI = "winman";
+    static const char *wmURI;
+    static const char *wmAPI;
 };
 
 #endif // AFBCLIENT_H