[Spice-devel] [PATCH spice-server 12/12] Declare same enumerator in a single header

[Frediano Ziglio]

Avoid having duplication and desynchronisation.

Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
---
 server/cursor-channel-client.c | 6 ------
 server/cursor-channel-client.h | 6 ++++++
 server/cursor-channel.c        | 6 ------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/server/cursor-channel-client.c b/server/cursor-channel-client.c
index b7ab2e5..56efd1e 100644
--- a/server/cursor-channel-client.c
+++ b/server/cursor-channel-client.c
@@ -35,12 +35,6 @@
 #define CURSOR_CACHE_HASH_KEY(id) ((id) & CURSOR_CACHE_HASH_MASK)
 #define CURSOR_CLIENT_TIMEOUT 30000000000ULL //nano
 
-enum {
-    RED_PIPE_ITEM_TYPE_CURSOR = RED_PIPE_ITEM_TYPE_COMMON_LAST,
-    RED_PIPE_ITEM_TYPE_CURSOR_INIT,
-    RED_PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE,
-};
-
 G_DEFINE_TYPE(CursorChannelClient, cursor_channel_client, RED_TYPE_CHANNEL_CLIENT)
 
 #define CURSOR_CHANNEL_CLIENT_PRIVATE(o) \
diff --git a/server/cursor-channel-client.h b/server/cursor-channel-client.h
index fab6837..d1dd31d 100644
--- a/server/cursor-channel-client.h
+++ b/server/cursor-channel-client.h
@@ -72,6 +72,12 @@ void cursor_channel_client_on_disconnect(RedChannelClient *rcc);
 RedCacheItem* cursor_channel_client_cache_find(CursorChannelClient *ccc, uint64_t id);
 int cursor_channel_client_cache_add(CursorChannelClient *ccc, uint64_t id, size_t size);
 
+enum {
+    RED_PIPE_ITEM_TYPE_CURSOR = RED_PIPE_ITEM_TYPE_COMMON_LAST,
+    RED_PIPE_ITEM_TYPE_CURSOR_INIT,
+    RED_PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE,
+};
+
 G_END_DECLS
 
 #endif /* CURSOR_CHANNEL_CLIENT_H_ */
diff --git a/server/cursor-channel.c b/server/cursor-channel.c
index 7df8763..9a31e94 100644
--- a/server/cursor-channel.c
+++ b/server/cursor-channel.c
@@ -30,12 +30,6 @@
 
 #define CURSOR_CHANNEL(channel) ((CursorChannel*)(channel))
 
-enum {
-    RED_PIPE_ITEM_TYPE_CURSOR = RED_PIPE_ITEM_TYPE_COMMON_LAST,
-    RED_PIPE_ITEM_TYPE_CURSOR_INIT,
-    RED_PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE,
-};
-
 typedef struct CursorItem {
     QXLInstance *qxl;
     int refs;
-- 
2.7.4