diff options
| author | Alon Levy <alevy@redhat.com> | 2010-08-23 14:46:01 +0300 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2010-08-23 16:21:14 +0300 |
| commit | 807852a9c4eea6e70afcc7f4ed88b15ff216d5ee (patch) | |
| tree | a0c506ca8cd5cd9dad1828e2946f59ef0053d1cd | |
| parent | 96884bb63b29aed3fd1973de831a62c3596f18c8 (diff) | |
include path fixes because of spice-protcol updates
* mutex.h inlined into common/vdcommon.h
* vdagent.h renamed to spice/vd_agent.h
| -rw-r--r-- | common/vdcommon.h | 8 | ||||
| -rw-r--r-- | vdagent/desktop_layout.h | 2 | ||||
| -rw-r--r-- | vdservice/vdservice.cpp | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/common/vdcommon.h b/common/vdcommon.h index ba9d0ec..8d4b4de 100644 --- a/common/vdcommon.h +++ b/common/vdcommon.h @@ -21,9 +21,15 @@ #pragma warning(disable:4200) #include <windows.h> -#include "vdagent.h" +#include "spice/vd_agent.h" #include "vdlog.h" +typedef CRITICAL_SECTION mutex_t; + +#define MUTEX_INIT(mutex) InitializeCriticalSection(&mutex) +#define MUTEX_LOCK(mutex) EnterCriticalSection(&mutex) +#define MUTEX_UNLOCK(mutex) LeaveCriticalSection(&mutex) + #define VD_SERVICE_PIPE_NAME TEXT("\\\\.\\pipe\\vdservicepipe") #define VD_MESSAGE_HEADER_SIZE (sizeof(VDPipeMessage) + sizeof(VDAgentMessage)) #define VD_PIPE_BUF_SIZE (1024 * 1024) diff --git a/vdagent/desktop_layout.h b/vdagent/desktop_layout.h index 797a82c..dc8accb 100644 --- a/vdagent/desktop_layout.h +++ b/vdagent/desktop_layout.h @@ -18,8 +18,8 @@ #ifndef _H_DESKTOP_LAYOUT #define _H_DESKTOP_LAYOUT -#include "mutex.h" #include <vector> +#include "vdcommon.h" class DisplayMode { public: diff --git a/vdservice/vdservice.cpp b/vdservice/vdservice.cpp index 8139af4..903fff6 100644 --- a/vdservice/vdservice.cpp +++ b/vdservice/vdservice.cpp @@ -23,7 +23,6 @@ #include <tlhelp32.h> #include "vdcommon.h" #include "vdi_port.h" -#include "mutex.h" #define VD_SERVICE_DISPLAY_NAME TEXT("RHEV Spice Agent") #define VD_SERVICE_NAME TEXT("vdservice") |