Re: [Qemu-devel] [PATCH for-1.1] qemu-ga: Fix use of environ on Darwin

[Michael Roth]

On Sun, May 27, 2012 at 05:02:20PM +0200, Andreas Färber wrote:
> Use _NSGetEnviron() helper to access the environment.
> 
> Signed-off-by: Andreas Färber <address@hidden>
> Cc: Charlie Somerville <address@hidden>
> ---
>  Michael, can you please append this to your qemu-ga PULL?

Thanks, applied to qga tree. I'll send an updated PULL and mark the other one
stale.

> 
>  qga/commands-posix.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
> index dab3bf9..4a71c27 100644
> --- a/qga/commands-posix.c
> +++ b/qga/commands-posix.c
> @@ -22,8 +22,13 @@
>  #include "host-utils.h"
> 
>  #ifndef CONFIG_HAS_ENVIRON
> +#ifdef __APPLE__
> +#include <crt_externs.h>
> +#define environ (*_NSGetEnviron())
> +#else
>  extern char **environ;
>  #endif
> +#endif
> 
>  #if defined(__linux__)
>  #include <mntent.h>
> -- 
> 1.7.5.3
>