haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Tracing pull request

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJTIF8KAAoJEJykq7OBq3PIaUsH/iLvgGkXdJXcel3yineH+IRM
 fdTNCmQ53EeL93bS1JL23Q5OqoLOxTv62Yqm/r+odarYwDyNaPl3bJwx5iKLCiOU
 Z23wzlTMe3v80Pp2cmwR2Vaiq3jiWjzdGl8zhrDObUfX8dG3Zvq7sh8r3LJUfD7f
 efRhSgcFJFLQNlTJhKsSuXqvtZCfD2SqoW0KTtP5lJ99PEZ7lo9r0W7oIBJeuqDH
 3ijz5jBAw1ezUfuU3P/03bRy5uQ1contZEx9iesA2/KNUkuCfZwhLC5QGundy0C6
 TfZQKeWm7NyAwQLrkVkhM82cxUNnLe5ShKCqRKeNqLfdxBso101MlGUxxg8QoW4=
 =w14h
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

Tracing pull request

# gpg: Signature made Wed 12 Mar 2014 13:20:10 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: Fix build warnings for Win32 build

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-03-12 15:46:43 +00:00
parent 01ac27ce7f 84f3fe1b07
commit a822837d12
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
trace/control-internal.h
View file

@ -16,17 +16,17 @@
extern TraceEvent trace_events[];
static inline TraceEventID trace_event_count(void)
{
return TRACE_EVENT_COUNT;
}
static inline TraceEvent *trace_event_id(TraceEventID id)
{
assert(id < trace_event_count());
return &trace_events[id];
}
static inline TraceEventID trace_event_count(void)
{
return TRACE_EVENT_COUNT;
}
static inline bool trace_event_is_pattern(const char *str)
{
assert(str != NULL);