Avoids mismatching duplicate declarations causing potentially ABI incompatibilities. Signed-off-by: Frediano Ziglio <fziglio@xxxxxxxxxx> --- server/Makefile.am | 1 - server/demarshallers.h | 30 ------------------------------ server/display-channel.h | 1 - server/inputs-channel.c | 2 +- server/meson.build | 1 - server/red-channel.h | 2 +- server/reds.c | 1 - subprojects/spice-common | 2 +- 8 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 server/demarshallers.h diff --git a/server/Makefile.am b/server/Makefile.am index 91b3c8ae..34ec22ad 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -94,7 +94,6 @@ libserver_la_SOURCES = \ dcc.h \ dcc-private.h \ dcc-send.c \ - demarshallers.h \ dispatcher.c \ dispatcher.h \ display-channel.c \ diff --git a/server/demarshallers.h b/server/demarshallers.h deleted file mode 100644 index a2222e8d..00000000 --- a/server/demarshallers.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - Copyright (C) 2010 Red Hat, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef DEMARSHALLERS_H_ -#define DEMARSHALLERS_H_ - -#include <stddef.h> -#include <inttypes.h> - -typedef void (*message_destructor_t)(uint8_t *message); -typedef uint8_t * (*spice_parse_channel_func_t)(uint8_t *message_start, uint8_t *message_end, uint16_t message_type, int minor, - size_t *size_out, message_destructor_t *free_message); - -spice_parse_channel_func_t spice_get_client_channel_parser(uint32_t channel, unsigned int *max_message_type); - -#endif /* DEMARSHALLERS_H_ */ diff --git a/server/display-channel.h b/server/display-channel.h index e26d2ba1..455e224f 100644 --- a/server/display-channel.h +++ b/server/display-channel.h @@ -30,7 +30,6 @@ #include "memslot.h" #include "red-parse-qxl.h" #include "red-record-qxl.h" -#include "demarshallers.h" #include "red-channel.h" #include "dispatcher.h" #include "main-channel.h" diff --git a/server/inputs-channel.c b/server/inputs-channel.c index e01bb7d0..20ebd11c 100644 --- a/server/inputs-channel.c +++ b/server/inputs-channel.c @@ -27,8 +27,8 @@ #include <common/marshaller.h> #include <common/messages.h> #include <common/generated_server_marshallers.h> +#include <common/demarshallers.h> -#include "demarshallers.h" #include "spice.h" #include "red-common.h" #include "reds.h" diff --git a/server/meson.build b/server/meson.build index 0b89acb0..2c024120 100644 --- a/server/meson.build +++ b/server/meson.build @@ -61,7 +61,6 @@ spice_server_sources = [ 'dcc.h', 'dcc-private.h', 'dcc-send.c', - 'demarshallers.h', 'dispatcher.c', 'dispatcher.h', 'display-channel.c', diff --git a/server/red-channel.h b/server/red-channel.h index ad446e60..bb3a95e8 100644 --- a/server/red-channel.h +++ b/server/red-channel.h @@ -27,8 +27,8 @@ #include <glib-object.h> #include <common/ring.h> #include <common/marshaller.h> +#include <common/demarshallers.h> -#include "demarshallers.h" #include "spice.h" #include "red-common.h" #include "red-stream.h" diff --git a/server/reds.c b/server/reds.c index ffc093f5..ea4dde10 100644 --- a/server/reds.c +++ b/server/reds.c @@ -58,7 +58,6 @@ #include "main-dispatcher.h" #include "sound.h" #include "stat.h" -#include "demarshallers.h" #include "char-device.h" #include "migration-protocol.h" #ifdef USE_SMARTCARD diff --git a/subprojects/spice-common b/subprojects/spice-common index bb15d481..b1047ed3 160000 --- a/subprojects/spice-common +++ b/subprojects/spice-common @@ -1 +1 @@ -Subproject commit bb15d4815ab586b4c4a20f4a565970a44824c42c +Subproject commit b1047ed3ade1621a4bd7d887ff75c1b73161c7ff -- 2.17.2 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel