[Spice-commits] 2 commits - server/spice-migration.h server/spice-server.h

[Marc-André Lureau]

 server/spice-migration.h |    3 ---
 server/spice-server.h    |    4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 238765fb7bd0057df50e27cf4bcd7dc9bc8bdc36
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Thu Nov 27 15:03:18 2014 +0100

    Add explicit spice-core.h include
    
    Several functions use core interfaces, add and explicit include.

diff --git a/server/spice-server.h b/server/spice-server.h
index 01f9a94..79daac5 100644
--- a/server/spice-server.h
+++ b/server/spice-server.h
@@ -22,7 +22,7 @@
 #error "Only spice.h can be included directly."
 #endif
 
-/* spice server setup */
+#include "spice-core.h"
 
 /* Don't use features incompatible with a specific spice
    version, so that migration to/from that version works. */
commit 116d84a22904a3ae5bb7c1336523c4d330eaf0cd
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Thu Nov 27 15:01:19 2014 +0100

    Move spice_server_get_num_clients() declaration
    
    This function is not related to migration.

diff --git a/server/spice-migration.h b/server/spice-migration.h
index e2fc92e..51c6444 100644
--- a/server/spice-migration.h
+++ b/server/spice-migration.h
@@ -49,9 +49,6 @@ int spice_server_migrate_info(SpiceServer *s, const char* dest,
                               const char* cert_subject);
 int spice_server_migrate_switch(SpiceServer *s);
 
-/* server status */
-int spice_server_get_num_clients(SpiceServer *s);
-
 /* spice (semi-)seamless client migration */
 int spice_server_migrate_connect(SpiceServer *s, const char* dest,
                                  int port, int secure_port,
diff --git a/server/spice-server.h b/server/spice-server.h
index ac63a94..01f9a94 100644
--- a/server/spice-server.h
+++ b/server/spice-server.h
@@ -121,4 +121,6 @@ void spice_server_set_uuid(SpiceServer *s, const uint8_t uuid[16]);
 void spice_server_vm_start(SpiceServer *s);
 void spice_server_vm_stop(SpiceServer *s);
 
+int spice_server_get_num_clients(SpiceServer *s);
+
 #endif /* SPICE_SERVER_H_ */