[Spice-devel] [PATCH spice-server v4 04/20] windows: Undefine some conflicting preprocessor macros

[Marc-André Lureau]

Hi

On Wed, Feb 6, 2019 at 2:59 PM Frediano Ziglio <fziglio at redhat.com> wrote:
>
> "interface" and "MAX_MONITORS" are defined in some Windows system
> headers causing garbage code to be fed to the compiler.
>
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>

To avoid the conflict, I suggest renaming those instead.

> ---
>  server/red-qxl.c | 4 ++++
>  server/reds.c    | 6 ++++++
>  2 files changed, 10 insertions(+)
>
> diff --git a/server/red-qxl.c b/server/red-qxl.c
> index 0dd26b22..9b9b8c17 100644
> --- a/server/red-qxl.c
> +++ b/server/red-qxl.c
> @@ -40,6 +40,10 @@
>
>  #include "red-qxl.h"
>
> +#ifdef _WIN32
> +// undefine conflicting preprocessor macros
> +#undef interface
> +#endif
>
>  #define MAX_MONITORS_COUNT 16
>
> diff --git a/server/reds.c b/server/reds.c
> index 8c1c10dc..97023b38 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -79,6 +79,12 @@
>  #include "net-utils.h"
>  #include "red-stream-device.h"
>
> +#ifdef _WIN32
> +// undefine conflicting preprocessor macros
> +#undef MAX_MONITORS
> +#undef interface
> +#endif
> +
>  #define REDS_MAX_STAT_NODES 100
>
>  static void reds_client_monitors_config(RedsState *reds, VDAgentMonitorsConfig *monitors_config);
> --
> 2.20.1
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel



-- 
Marc-André Lureau