Commit 223f0d72a88e1835b3c4c2bb1fa55c5562d1231a
1 parent
8bb6e981
Few compile time warnings removed (Stefano Stabellini)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5361 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
4 additions
and
3 deletions
vl.c
| @@ -71,7 +71,7 @@ | @@ -71,7 +71,7 @@ | ||
| 71 | #elif defined (__GLIBC__) && defined (__FreeBSD_kernel__) | 71 | #elif defined (__GLIBC__) && defined (__FreeBSD_kernel__) |
| 72 | #include <freebsd/stdlib.h> | 72 | #include <freebsd/stdlib.h> |
| 73 | #else | 73 | #else |
| 74 | -#ifndef __sun__ | 74 | +#ifdef __linux__ |
| 75 | #include <linux/if.h> | 75 | #include <linux/if.h> |
| 76 | #include <linux/if_tun.h> | 76 | #include <linux/if_tun.h> |
| 77 | #include <pty.h> | 77 | #include <pty.h> |
| @@ -85,7 +85,8 @@ | @@ -85,7 +85,8 @@ | ||
| 85 | 85 | ||
| 86 | #include <linux/ppdev.h> | 86 | #include <linux/ppdev.h> |
| 87 | #include <linux/parport.h> | 87 | #include <linux/parport.h> |
| 88 | -#else | 88 | +#endif |
| 89 | +#ifdef __sun__ | ||
| 89 | #include <sys/stat.h> | 90 | #include <sys/stat.h> |
| 90 | #include <sys/ethernet.h> | 91 | #include <sys/ethernet.h> |
| 91 | #include <sys/sockio.h> | 92 | #include <sys/sockio.h> |
| @@ -1680,7 +1681,7 @@ static void win32_rearm_timer(struct qemu_alarm_timer *t) | @@ -1680,7 +1681,7 @@ static void win32_rearm_timer(struct qemu_alarm_timer *t) | ||
| 1680 | 1681 | ||
| 1681 | static void init_timer_alarm(void) | 1682 | static void init_timer_alarm(void) |
| 1682 | { | 1683 | { |
| 1683 | - struct qemu_alarm_timer *t; | 1684 | + struct qemu_alarm_timer *t = NULL; |
| 1684 | int i, err = -1; | 1685 | int i, err = -1; |
| 1685 | 1686 | ||
| 1686 | for (i = 0; alarm_timers[i].name; i++) { | 1687 | for (i = 0; alarm_timers[i].name; i++) { |