[Spice-devel] [PATCH spice-common] allow log.c to compile under MSVC++

Alon Levy alevy at redhat.com
Tue Apr 17 08:58:59 PDT 2012


On Tue, Apr 17, 2012 at 09:36:52AM -0500, Aric Stewart wrote:
> ---
>  common/log.c |   12 ++++++++++++
>  1 files changed, 12 insertions(+), 0 deletions(-)
> 

ACK and pushing.

> diff --git a/common/log.c b/common/log.c
> index ef4da06..3cbcef6 100644
> --- a/common/log.c
> +++ b/common/log.c
> @@ -22,7 +22,9 @@
>  #include <stdlib.h>
>  #include <stdio.h>
>  #include <sys/types.h>
> +#ifndef _MSC_VER
>  #include <unistd.h>
> +#endif
>   #include "log.h"
>  #include "backtrace.h"
> @@ -32,6 +34,15 @@ static int abort_level = -1;
>   static const char * spice_log_level_to_string(SpiceLogLevel level)
>  {
> +#ifdef _MSC_VER
> +    /* MSVC++ does not implement C99 */
> +    static const char *to_string[] = {
> +         "ERROR",
> +         "CRITICAL",
> +         "Warning",
> +         "Info",
> +         "Debug"};
> +#else
>      static const char *to_string[] = {
>          [ SPICE_LOG_LEVEL_ERROR ] = "ERROR",
>          [ SPICE_LOG_LEVEL_CRITICAL ] = "CRITICAL",
> @@ -39,6 +50,7 @@ static const char *
> spice_log_level_to_string(SpiceLogLevel level)
>          [ SPICE_LOG_LEVEL_INFO ] = "Info",
>          [ SPICE_LOG_LEVEL_DEBUG ] = "Debug",
>      };
> +#endif
>      const char *str = NULL;
>        if (level < SPICE_N_ELEMENTS(to_string)) {
> -- 
> 1.6.0.rc1.64.g61192
> 


> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel



More information about the Spice-devel mailing list