X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fjson_server.cc;h=9c1034a68bf6f26e41df3a15e0d040ead6044f4a;hb=2d10f2ed6596cae02a6ed7321c5c79ffef4ef75b;hp=3f43a75eb8ee332a53d0a1bac1cb0e2ecc6e1dd0;hpb=8e4a2e5ea578ac4f0f41edb6145d5c0040e33ec2;p=dcpomatic.git diff --git a/src/lib/json_server.cc b/src/lib/json_server.cc index 3f43a75eb..9c1034a68 100644 --- a/src/lib/json_server.cc +++ b/src/lib/json_server.cc @@ -26,7 +26,7 @@ #include "transcode_job.h" #include #include -#include +#include #include #include @@ -35,8 +35,8 @@ using std::cout; using std::map; using std::list; using boost::thread; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::asio::ip::tcp; using dcp::raw_convert; @@ -52,9 +52,11 @@ enum State { JSONServer::JSONServer (int port) { - thread* t = new thread (boost::bind (&JSONServer::run, this, port)); #ifdef DCPOMATIC_LINUX + thread* t = new thread (boost::bind (&JSONServer::run, this, port)); pthread_setname_np (t->native_handle(), "json-server"); +#else + new thread (boost::bind (&JSONServer::run, this, port)); #endif }