diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2012-05-23 15:48:05 -0300 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2012-05-24 13:06:33 -0500 |
| commit | 2c02cbf6e929c20545b46feb5ecde9c86877198a (patch) | |
| tree | f7bf0fcee7ae56fe999ad3564b825a0a7144f5b8 /qga | |
| parent | 8ab1bf120d7fcf84f199679ad0d25acbc354c69c (diff) | |
| download | qemu-2c02cbf6e929c20545b46feb5ecde9c86877198a.zip qemu-2c02cbf6e929c20545b46feb5ecde9c86877198a.tar.gz qemu-2c02cbf6e929c20545b46feb5ecde9c86877198a.tar.bz2 | |
qemu-ga: Fix missing environ declaration
Commit 3674838cd05268954bb6473239cd7f700a79bf0f uses the environ global
variable, but is relying on environ to be declared somewhere else.
This worked for me because on F16 environ is declared in <unistd.h>, but
that doesn't happen in OpenBSD for example, causing a build failure.
This commit fixes the build error by declaring environ if it hasn't
being declared yet.
Also fixes a build warning due to a missing <sys/wait.h> include.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'qga')
| -rw-r--r-- | qga/commands-posix.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 7664be1..dab3bf9 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -14,12 +14,17 @@ #include <glib.h> #include <sys/types.h> #include <sys/ioctl.h> +#include <sys/wait.h> #include "qga/guest-agent-core.h" #include "qga-qmp-commands.h" #include "qerror.h" #include "qemu-queue.h" #include "host-utils.h" +#ifndef CONFIG_HAS_ENVIRON +extern char **environ; +#endif + #if defined(__linux__) #include <mntent.h> #include <linux/fs.h> @@ -27,7 +32,6 @@ #include <arpa/inet.h> #include <sys/socket.h> #include <net/if.h> -#include <sys/wait.h> #if defined(__linux__) && defined(FIFREEZE) #define CONFIG_FSFREEZE |