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

[Christophe Fergeau]

On Tue, Apr 17, 2012 at 06:58:59PM +0300, Alon Levy wrote:
> 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

For what it's worth, I would have suggested just using the first construct
even on linux, but this way is fine with me too.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20120417/de082a04/attachment.pgp>