Index: ioemu/vl.c =================================================================== --- ioemu.orig/vl.c 2007-05-03 19:11:56.000000000 +0100 +++ ioemu/vl.c 2007-05-03 19:11:59.000000000 +0100 @@ -912,6 +912,16 @@ } } +#ifdef CONFIG_DM +static void timer_save(QEMUFile *f, void *opaque) +{ +} + +static int timer_load(QEMUFile *f, void *opaque, int version_id) +{ + return 0; +} +#else /* !CONFIG_DM */ static void timer_save(QEMUFile *f, void *opaque) { if (cpu_ticks_enabled) { @@ -1032,6 +1042,8 @@ #endif /* !defined(_WIN32) */ +#endif /* !CONFIG_DM */ + static void init_timer_alarm(void) { #ifdef _WIN32 @@ -1063,12 +1075,15 @@ pit_min_timer_count = ((uint64_t)10000 * PIT_FREQ) / 1000000; #else { +#ifndef CONFIG_DM struct sigaction act; struct itimerval itv; +#endif /* get times() syscall frequency */ timer_freq = sysconf(_SC_CLK_TCK); +#ifndef CONFIG_DM /* timer signal */ sigfillset(&act.sa_mask); act.sa_flags = 0; @@ -1114,6 +1129,7 @@ pit_min_timer_count = ((uint64_t)itv.it_interval.tv_usec * PIT_FREQ) / 1000000; } +#endif /* CONFIG_DM */ } #endif } r> aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/version.py
blob: 0af60af5319930fe47005a4bb31f1fc962bcc632 (plain)
1
2
3
4
5
6
7
8
9
10
11
from __future__ import (absolute_import, print_function, division)

IVERSION = (0, 13, 1)
VERSION = ".".join(str(i) for i in IVERSION)
MINORVERSION = ".".join(str(i) for i in IVERSION[:2])
NAME = "mitmproxy"
NAMEVERSION = NAME + " " + VERSION

NEXT_MINORVERSION = list(IVERSION)
NEXT_MINORVERSION[1] += 1
NEXT_MINORVERSION = ".".join(str(i) for i in NEXT_MINORVERSION[:2])