diff options
| author | Jonas Suhr Christensen <jsc@umbraculum.org> | 2012-05-04 10:46:40 +0200 |
|---|---|---|
| committer | Jonas Suhr Christensen <jsc@umbraculum.org> | 2012-05-04 10:46:40 +0200 |
| commit | 3ad0a2d6f49c6f5371e8c3b0b5c502aea58aeb75 (patch) | |
| tree | e9b7e4ca4d5a786abda065deb2868fe8132aec30 /src/munia_proto.cc | |
| parent | d0bd8f44997150bcb06137258512654c75e79b49 (diff) | |
| parent | de7c3ed2ccadcd179449dee6b8e38f6d7d2df3c6 (diff) | |
Merge branch 'master' of https://git.oftal.dk/munia
Diffstat (limited to 'src/munia_proto.cc')
| -rw-r--r-- | src/munia_proto.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/munia_proto.cc b/src/munia_proto.cc index b801009..a91c204 100644 --- a/src/munia_proto.cc +++ b/src/munia_proto.cc @@ -38,10 +38,9 @@ #include "messagehandler.h" #include "connectionhandler.h" +// Defines global task_manager object #include "taskmanager.h" -extern TaskManager taskman; - #if 0 static void dump_handshake_info(struct lws_tokens *lwst) { @@ -89,7 +88,7 @@ int callback_lws_task(struct libwebsocket_context * context, enum libwebsocket_callback_reasons reason, void *user, void *in, size_t len) { - taskman.tree.toStdOut(); + task_manager.tree.toStdOut(); printf("Callback on %p\n", wsi); |