From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=38700 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OJKxa-00075m-2V
	for qemu-devel@nongnu.org; Tue, 01 Jun 2010 02:28:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jan.kiszka@web.de>) id 1OJKxZ-0002Kw-AO
	for qemu-devel@nongnu.org; Tue, 01 Jun 2010 02:28:21 -0400
Received: from fmmailgate03.web.de ([217.72.192.234]:41199)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jan.kiszka@web.de>) id 1OJKxY-0002K2-Ur
	for qemu-devel@nongnu.org; Tue, 01 Jun 2010 02:28:21 -0400
Message-ID: <4C04A87D.5060505@web.de>
Date: Tue, 01 Jun 2010 08:28:13 +0200
From: Jan Kiszka <jan.kiszka@web.de>
MIME-Version: 1.0
References: <AANLkTikka7d2puLjlEGeMNDQkUQauh6Mzujs7QBwtV95@mail.gmail.com>
In-Reply-To: <AANLkTikka7d2puLjlEGeMNDQkUQauh6Mzujs7QBwtV95@mail.gmail.com>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enigAF53B1C986F53453421E1A7A"
Sender: jan.kiszka@web.de
Subject: [Qemu-devel] Re: [PATCH v2] sdl: fix setenv for win32
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: TeLeMan <geleman@gmail.com>
Cc: qemu-devel <qemu-devel@nongnu.org>

This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enigAF53B1C986F53453421E1A7A
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

TeLeMan wrote:
> setenv() is not implemented on MinGW, so we have to use putenv().
>=20
> Signed-off-by: TeLeMan <geleman@gmail.com>
> ---
>  sdl.c |    7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
>=20
> diff --git a/sdl.c b/sdl.c
> index add1148..eac898a 100644
> --- a/sdl.c
> +++ b/sdl.c
> @@ -850,7 +850,14 @@ void sdl_display_init(DisplayState *ds, int
> full_screen, int no_frame)
>          gui_noframe =3D 1;
>=20
>      if (!full_screen) {
> +#ifdef _WIN32
> +        /* setenv() is not implemented on MinGW */
> +        if(!getenv("SDL_VIDEO_ALLOW_SCREENSAVER")) {
> +            putenv("SDL_VIDEO_ALLOW_SCREENSAVER=3D1");
> +        }
> +#else
>          setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 0);
> +#endif

As I said: both variants are equivalent, no need for #ifdefs, just
consolidate over the open-coded version.

>      }
>=20
>      flags =3D SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE;

Jan


--------------enigAF53B1C986F53453421E1A7A
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iEYEARECAAYFAkwEqIEACgkQitSsb3rl5xTOCACgqA7IXUsoPd9aEnqsL9ylAC3Q
zhkAn3V6jp81g3PeFUTH8KdZueEYUEoN
=mlcc
-----END PGP SIGNATURE-----

--------------enigAF53B1C986F53453421E1A7A--