aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-09-30 18:12:18 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2008-09-30 18:12:18 +0000
commit223f0d72a88e1835b3c4c2bb1fa55c5562d1231a (patch)
tree330d8504d5970d57b60c6e806778667544a909a7
parent8bb6e981e09c914783c0a7d43c711de4e4f36ad4 (diff)
Few compile time warnings removed (Stefano Stabellini)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5361 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--vl.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/vl.c b/vl.c
index e07686d12c..d7da9b57af 100644
--- a/vl.c
+++ b/vl.c
@@ -71,7 +71,7 @@
#elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
#include <freebsd/stdlib.h>
#else
-#ifndef __sun__
+#ifdef __linux__
#include <linux/if.h>
#include <linux/if_tun.h>
#include <pty.h>
@@ -85,7 +85,8 @@
#include <linux/ppdev.h>
#include <linux/parport.h>
-#else
+#endif
+#ifdef __sun__
#include <sys/stat.h>
#include <sys/ethernet.h>
#include <sys/sockio.h>
@@ -1680,7 +1681,7 @@ static void win32_rearm_timer(struct qemu_alarm_timer *t)
static void init_timer_alarm(void)
{
- struct qemu_alarm_timer *t;
+ struct qemu_alarm_timer *t = NULL;
int i, err = -1;
for (i = 0; alarm_timers[i].name; i++) {