Merge remote-tracking branch 'origin/master' into 0.100.10.1

8 files changed, 12 insertions, 12 deletions

diff --git a/client/.gitignore b/client/.gitignore
index 39a4cf7a..0561c05c 100644
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -10,3 +10,4 @@ generated_demarshallers.cpp
 generated_demarshallers1.cpp
 generated_marshallers.cpp
 generated_marshallers1.cpp
+spicec
diff --git a/client/foreign_menu.cpp b/client/foreign_menu.cpp
index d1df49d0..faef4c27 100644
--- a/client/foreign_menu.cpp
+++ b/client/foreign_menu.cpp
@@ -30,7 +30,7 @@
 
 #ifdef WIN32
 #define PIPE_NAME "SpiceForeignMenu-%lu"
-#elif defined(__i386__)
+#elif defined(__i386__) || __SIZEOF_LONG__ == 4
 #define PIPE_NAME "/tmp/SpiceForeignMenu-%llu.uds"
 #else
 #define PIPE_NAME "/tmp/SpiceForeignMenu-%lu.uds"
diff --git a/client/gui/softrenderer.cpp b/client/gui/softrenderer.cpp
index 9f19e7b0..c888bc03 100644
--- a/client/gui/softrenderer.cpp
+++ b/client/gui/softrenderer.cpp
@@ -45,7 +45,7 @@ SoftRenderer::SoftRenderer(uint8_t* surface, uint width, uint height, uint strid
     , _image_codec_module (NULL)
     , _queueing(true)
 {
-    assert(stride == _width * 4); //for now
+    assert(stride == width * 4); //for now
     if (!_image_codec) {
         setupImageCodec();
     }
diff --git a/client/x11/.gitignore b/client/x11/.gitignore
index 397a68f4..2f08d7eb 100644
--- a/client/x11/.gitignore
+++ b/client/x11/.gitignore
@@ -3,6 +3,7 @@
 *.loT
 *.o
 .deps
+.dirstamp
 .libs
 Makefile
 Makefile.in
diff --git a/client/x11/event_sources_p.cpp b/client/x11/event_sources_p.cpp
index 1958a04d..5f9f4523 100644
--- a/client/x11/event_sources_p.cpp
+++ b/client/x11/event_sources_p.cpp
@@ -119,7 +119,7 @@ bool EventSources::wait_events(int timeout_msec)
         return false;
     }
 
-    for (int i = 0; i < _events.size(); i++) {
+    for (unsigned int i = 0; i < _events.size(); i++) {
         if (FD_ISSET(_fds[i], &rfds)) {
             _events[i]->action();
             /* The action may have removed / added event sources changing
diff --git a/client/x11/named_pipe.cpp b/client/x11/named_pipe.cpp
index 84b980dc..ad6b2e5c 100644
--- a/client/x11/named_pipe.cpp
+++ b/client/x11/named_pipe.cpp
@@ -20,7 +20,6 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/epoll.h>
 #include <sys/un.h>
 #include "named_pipe.h"
 #include "utils.h"
diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp
index df8fa768..f535d6da 100644
--- a/client/x11/platform.cpp
+++ b/client/x11/platform.cpp
@@ -34,7 +34,6 @@
 #include <X11/extensions/Xfixes.h>
 #include <unistd.h>
 #include <sys/socket.h>
-#include <sys/epoll.h>
 #include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/syscall.h>
@@ -136,7 +135,7 @@ static struct clipboard_format_info clipboard_formats[] = {
     { VD_AGENT_CLIPBOARD_IMAGE_JPG, { "image/jpeg", NULL }, },
 };
 
-#define clipboard_format_count (sizeof(clipboard_formats)/sizeof(clipboard_formats[0]))
+#define clipboard_format_count ((int)(sizeof(clipboard_formats)/sizeof(clipboard_formats[0])))
 
 struct selection_request {
     XEvent event;
@@ -146,11 +145,11 @@ struct selection_request {
 static int expected_targets_notifies = 0;
 static bool waiting_for_property_notify = false;
 static uint8_t* clipboard_data = NULL;
-static int32_t clipboard_data_size = 0;
-static int32_t clipboard_data_space = 0;
+static uint32_t clipboard_data_size = 0;
+static uint32_t clipboard_data_space = 0;
 static Atom clipboard_request_target = None;
 static selection_request *next_selection_request = NULL;
-static uint32_t clipboard_type_count = 0;
+static int clipboard_type_count = 0;
 static uint32_t clipboard_agent_types[256];
 static Atom clipboard_x11_targets[256];
 static Mutex clipboard_lock;
@@ -1243,7 +1242,7 @@ private:
     void update_position();
     bool find_mode_in_outputs(RRMode mode, int start_index, XRRScreenResources* res);
     bool find_mode_in_clones(RRMode mode, XRRScreenResources* res);
-    XRRModeInfo* find_mode(int width, int height, XRRScreenResources* res);
+    XRRModeInfo* find_mode(unsigned int width, unsigned int height, XRRScreenResources* res);
 
 private:
     MultyMonScreen& _container;
@@ -2182,7 +2181,7 @@ public:
     }
 };
 
-XRRModeInfo* XMonitor::find_mode(int width, int height, XRRScreenResources* res)
+XRRModeInfo* XMonitor::find_mode(unsigned int width, unsigned int height, XRRScreenResources* res)
 {
     typedef std::set<ModeInfo, ModeCompare> ModesSet;
     ModesSet modes_set;
diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp
index e0b7d456..b16249ea 100644
--- a/client/x11/red_window.cpp
+++ b/client/x11/red_window.cpp
@@ -922,7 +922,7 @@ void RedWindow_p::win_proc(XEvent& event)
     case ClientMessage:
         if (event.xclient.message_type == wm_protocol_atom) {
             ASSERT(event.xclient.format == 32);
-            if (event.xclient.data.l[0] == wm_delete_window_atom) {
+            if ((Atom)event.xclient.data.l[0] == wm_delete_window_atom) {
                 DBG(0, "wm_delete_window");
                 Platform::send_quit_request();
             }