[Spice-commits] 2 commits - server/red_channel.h server/red_dispatcher.h server/red_worker.c server/utils.h

[Frediano Ziglio]

 server/red_channel.h    |    1 -
 server/red_dispatcher.h |    1 -
 server/red_worker.c     |    4 ++--
 server/utils.h          |    1 +
 4 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 37763930cdc3c9d62e1cfe2384e841260948505e
Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Mon Nov 16 10:20:56 2015 +0000

    server: Duplicate typedef definitions are not allowed in C99
    
    This fixes some compilation errors with gcc 4.4.7 on RHEL 6.
    
    Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
    Acked-by: Fabiano Fidêncio <fidencio at redhat.com>

diff --git a/server/red_channel.h b/server/red_channel.h
index eda4436..4deecb6 100644
--- a/server/red_channel.h
+++ b/server/red_channel.h
@@ -128,7 +128,6 @@ typedef struct OutgoingHandler {
 
 /* Red Channel interface */
 
-typedef struct RedsStream RedsStream;
 typedef struct RedChannel RedChannel;
 typedef struct RedChannelClient RedChannelClient;
 typedef struct RedClient RedClient;
diff --git a/server/red_dispatcher.h b/server/red_dispatcher.h
index 02337b8..fef067c 100644
--- a/server/red_dispatcher.h
+++ b/server/red_dispatcher.h
@@ -23,7 +23,6 @@
 #include "red_channel.h"
 
 typedef struct RedDispatcher RedDispatcher;
-typedef struct RedChannelClient RedChannelClient;
 
 typedef struct AsyncCommand AsyncCommand;
 
diff --git a/server/red_worker.c b/server/red_worker.c
index 9673288..165e4c0 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -233,7 +233,7 @@ typedef struct RedSurface {
     QXLReleaseInfoExt create, destroy;
 } RedSurface;
 
-typedef struct RedWorker {
+struct RedWorker {
     pthread_t thread;
     clockid_t clockid;
     QXLInstance *qxl;
@@ -290,7 +290,7 @@ typedef struct RedWorker {
     int driver_cap_monitors_config;
 
     FILE *record_fd;
-} RedWorker;
+};
 
 typedef enum {
     BITMAP_DATA_TYPE_INVALID,
commit bd2bbe2fdd9f230fc6b8a75dec612626dcce71f7
Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Mon Nov 16 10:20:29 2015 +0000

    server: Include stdint.h for int64_t
    
    This fixes a compilation error with gcc 4.4 on RHEL 6.
    
    Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
    Acked-by: Fabiano Fidêncio <fidencio at redhat.com>

diff --git a/server/utils.h b/server/utils.h
index 1ebc32f..cae03d4 100644
--- a/server/utils.h
+++ b/server/utils.h
@@ -19,6 +19,7 @@
 # define UTILS_H_
 
 #include <time.h>
+#include <stdint.h>
 
 typedef int64_t red_time_t;