pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-08 19:19:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

server: Use SPICE_GNUC_DEPRECATED to avoid a dependency on glib.h

Browse Source 
spice-server.h cannot include glib.h because it is a public header and
is used by projects that do not use GLib.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Francois Gouget 2016-08-12 09:45:59 +01:00 committed by Frediano Ziglio
parent 319a31ad81
commit d146793dd9
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/spice-migration.h
View File

@ -46,8 +46,8 @@ struct SpiceMigrateInstance {
/* spice switch-host client migration */
int spice_server_migrate_info(SpiceServer *s, const char* dest,
int port, int secure_port,
const char* cert_subject) G_GNUC_DEPRECATED;
int spice_server_migrate_switch(SpiceServer *s) G_GNUC_DEPRECATED;
const char* cert_subject) SPICE_GNUC_DEPRECATED;
int spice_server_migrate_switch(SpiceServer *s) SPICE_GNUC_DEPRECATED;
/* spice (semi-)seamless client migration */
int spice_server_migrate_connect(SpiceServer *s, const char* dest,

12
server/spice-server.h
View File

@ -22,8 +22,6 @@
#error "Only spice.h can be included directly."
#endif
#include <glib.h>
#include "spice-core.h"
/* Don't use features incompatible with a specific spice
@ -50,7 +48,7 @@ int spice_server_set_compat_version(SpiceServer *s,
spice_compat_version_t version);
int spice_server_set_port(SpiceServer *s, int port);
void spice_server_set_addr(SpiceServer *s, const char *addr, int flags);
int spice_server_set_listen_socket_fd(SpiceServer *s, int listen_fd) G_GNUC_DEPRECATED;
int spice_server_set_listen_socket_fd(SpiceServer *s, int listen_fd) SPICE_GNUC_DEPRECATED;
int spice_server_set_exit_on_disconnect(SpiceServer *s, int flag);
int spice_server_set_noauth(SpiceServer *s);
int spice_server_set_sasl(SpiceServer *s, int enabled);
@ -104,7 +102,7 @@ int spice_server_set_zlib_glz_compression(SpiceServer *s, spice_wan_compression_
int spice_server_set_channel_security(SpiceServer *s, const char *channel, int security);
int spice_server_add_renderer(SpiceServer *s, const char *name) G_GNUC_DEPRECATED;
int spice_server_add_renderer(SpiceServer *s, const char *name) SPICE_GNUC_DEPRECATED;
enum {
SPICE_STREAM_VIDEO_INVALID,
@ -127,8 +125,8 @@ int spice_server_set_agent_mouse(SpiceServer *s, int enable);
int spice_server_set_agent_copypaste(SpiceServer *s, int enable);
int spice_server_set_agent_file_xfer(SpiceServer *s, int enable);
int spice_server_get_sock_info(SpiceServer *s, struct sockaddr *sa, socklen_t *salen) G_GNUC_DEPRECATED;
int spice_server_get_peer_info(SpiceServer *s, struct sockaddr *sa, socklen_t *salen) G_GNUC_DEPRECATED;
int spice_server_get_sock_info(SpiceServer *s, struct sockaddr *sa, socklen_t *salen) SPICE_GNUC_DEPRECATED;
int spice_server_get_peer_info(SpiceServer *s, struct sockaddr *sa, socklen_t *salen) SPICE_GNUC_DEPRECATED;
int spice_server_is_server_mouse(SpiceServer *s);
@ -138,6 +136,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) G_GNUC_DEPRECATED;
int spice_server_get_num_clients(SpiceServer *s) SPICE_GNUC_DEPRECATED;
#endif /* SPICE_SERVER_H_ */