diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-29 15:04:20 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-29 15:04:20 +0100 |
| commit | 75507f1aba6feb73ae43329922d51571550b9128 (patch) | |
| tree | afdc91cca05f534d22838da16dac63e13ace3307 /trace | |
| parent | 109b25045b3651f9c5d02c3766c0b3ff63e6d193 (diff) | |
| parent | e71e8cc035558eabd6b3e19f6d3254c754c027ef (diff) | |
Merge remote-tracking branch 'remotes/berrange/tags/min-glib-pull-request' into staging
glib: update the min required version
This updates the minimum required glib version to 2.40
# gpg: Signature made Fri 29 Jun 2018 12:24:58 BST
# gpg: using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/min-glib-pull-request:
glib: enforce the minimum required version and warn about old APIs
glib: bump min required glib library version to 2.40
util: remove redundant include of glib.h and add osdep.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'trace')
| -rw-r--r-- | trace/simple.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/trace/simple.c b/trace/simple.c index e82018d923..701dec639c 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -36,9 +36,9 @@ * Trace records are written out by a dedicated thread. The thread waits for * records to become available, writes them out, and then waits again. */ -static CompatGMutex trace_lock; -static CompatGCond trace_available_cond; -static CompatGCond trace_empty_cond; +static GMutex trace_lock; +static GCond trace_available_cond; +static GCond trace_empty_cond; static bool trace_available; static bool trace_writeout_enabled; |