diff options
| author | Yaniv Kamay <ykamay@redhat.com> | 2009-10-26 23:30:41 +0200 |
|---|---|---|
| committer | Yaniv Kamay <ykamay@redhat.com> | 2009-10-26 23:30:41 +0200 |
| commit | c12c3facbd32c30267949ddf4eaa71ca5134718e (patch) | |
| tree | 7d53d50c93238ad3869a0f8f94d75020bd27b196 /server | |
| parent | 48535714bfe126331c6eeaae220b4957d49c660a (diff) | |
| download | spice-c12c3facbd32c30267949ddf4eaa71ca5134718e.tar.gz spice-c12c3facbd32c30267949ddf4eaa71ca5134718e.tar.xz spice-c12c3facbd32c30267949ddf4eaa71ca5134718e.zip | |
fix build on Debian
Diffstat (limited to 'server')
| -rw-r--r-- | server/Makefile.am | 1 | ||||
| -rw-r--r-- | server/red_worker.c | 2 | ||||
| -rw-r--r-- | server/reds.c | 8 |
3 files changed, 7 insertions, 4 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index f9909615..fdaa15a5 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -3,6 +3,7 @@ NULL = INCLUDES = \ -I. \ -I$(top_srcdir)/common \ + -I$(top_srcdir)/common/linux \ $(FFMPEG_CFLAGS) \ $(QCAIRO_CFLAGS) \ $(GL_CFLAGS) \ diff --git a/server/red_worker.c b/server/red_worker.c index 4604e05e..1490f9e7 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -39,7 +39,7 @@ #include "cairo_canvas.h" #include "gl_canvas.h" #include "ogl_ctx.h" -#include "libavcodec/avcodec.h" +#include "ffmpeg_inc.h" #include "quic.h" #include "lz.h" #include "glz_encoder_dictionary.h" diff --git a/server/reds.c b/server/reds.c index 4630e958..8ea9f56f 100644 --- a/server/reds.c +++ b/server/reds.c @@ -27,7 +27,6 @@ #include <time.h> #include <pthread.h> #include <sys/mman.h> -#include <sys/user.h> #include <fcntl.h> #include <errno.h> #include <ctype.h> @@ -356,7 +355,10 @@ typedef struct PingItem { int size; } PingItem; -static uint8_t zero_page[PAGE_SIZE] = {0}; + +#define ZERO_BUF_SIZE 4096 + +static uint8_t zero_page[ZERO_BUF_SIZE] = {0}; static void reds_main_write(void *data); static void reds_push(); @@ -1085,7 +1087,7 @@ static void reds_prepare_ping_item(RedsOutItem *in_item, struct iovec* vec, int int pos = 2; while (size) { ASSERT(pos < REDS_MAX_SEND_IOVEC); - int now = MIN(PAGE_SIZE, size); + int now = MIN(ZERO_BUF_SIZE, size); size -= now; vec[pos].iov_base = zero_page; vec[pos].iov_len = now; |