Move AvahiPoll structure into read-only memory

[catta] / avahi-qt / qt-watch.cpp

diff --git a/avahi-qt/qt-watch.cpp b/avahi-qt/qt-watch.cpp
index 5b49845e5f278da6c802f83e1c5e92085d2ee1c0..f29b517d0950aa391a1b60380f3e9845ee2b8cc4 100644 (file)
--- a/avahi-qt/qt-watch.cpp
+++ b/avahi-qt/qt-watch.cpp
@@ -177,19 +177,19 @@ static void q_timeout_free(AvahiTimeout *t)
     delete t;
 }
 
-static AvahiPoll qt_poll;
-
 const AvahiPoll* avahi_qt_poll_get(void) 
 {
-    qt_poll.userdata=0;
-    qt_poll.watch_new = q_watch_new;
-    qt_poll.watch_free = q_watch_free;
-    qt_poll.watch_update = q_watch_update;
-    qt_poll.watch_get_events = q_watch_get_events;
-    
-    qt_poll.timeout_new = q_timeout_new;
-    qt_poll.timeout_free = q_timeout_free;
-    qt_poll.timeout_update = q_timeout_update;
+    static const AvahiPoll qt_poll = {
+        NULL,
+        q_watch_new,
+        q_watch_update,
+        q_watch_get_events,
+        q_watch_free,
+        q_timeout_new,
+        q_timeout_update,
+        q_timeout_free
+    };
+
     return &qt_poll;
 }