summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsungmin ha <sungmin82.ha@samsung.com>2014-03-17 16:22:22 +0900
committersungmin ha <sungmin82.ha@samsung.com>2014-03-17 16:25:15 +0900
commit72bfa07fe90674978dfa8ea0f39f1346a06992b2 (patch)
tree931e12500fc612bd05f4648aeea6c15b84943566
parent6b7e7485179366725e821e213eab8690e3e66c15 (diff)
downloadspice-server-72bfa07fe90674978dfa8ea0f39f1346a06992b2.tar.gz
spice-server-72bfa07fe90674978dfa8ea0f39f1346a06992b2.tar.bz2
spice-server-72bfa07fe90674978dfa8ea0f39f1346a06992b2.zip
minor modification for dibs build on 64bit
Change-Id: I1f08031ebc8182fa0fdcbc4068f66ea3e4afee9c Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
-rw-r--r--package/changelog3
-rw-r--r--package/pkginfo.manifest2
-rw-r--r--server/inputs_channel.c3
3 files changed, 5 insertions, 3 deletions
diff --git a/package/changelog b/package/changelog
index c0cd1ed..dd02200 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 1.0.5
+- minor modification for dibs build on 64bit
+== SungMin Ha <sungmin82.ha@samsung.com> 2014-03-17
* 1.0.4
- fixed undeclared build error on 64bit
== SungMin Ha <sungmin82.ha@samsung.com> 2014-03-17
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 337d19b..6d9273d 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version: 1.0.4
+Version: 1.0.5
Maintainer: SangHo Park<sangho1206.park@samsung.com>
Source: emulator
diff --git a/server/inputs_channel.c b/server/inputs_channel.c
index dd562ab..fc54783 100644
--- a/server/inputs_channel.c
+++ b/server/inputs_channel.c
@@ -28,9 +28,8 @@
#include <spice/vd_agent.h>
#include <spice/protocol.h>
-#ifdef CONFIG_MARU
+/* for MARU */
#include <spice/enums.h>
-#endif
#include "common/marshaller.h"
#include "common/messages.h"