summaryrefslogtreecommitdiff
path: root/src/core/ao_packet.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-12-25 14:20:42 -0800
committerKeith Packard <keithp@keithp.com>2012-12-25 14:20:42 -0800
commit868ef0c9c4b208c02a87180b0eede329369bdc77 (patch)
tree1f20d312d56bac34bad12f287629a2651bbbccf8 /src/core/ao_packet.h
parent669cde8a87d88ceae89e369c1d38b88c9f8198cf (diff)
parent57487e78b90465a21c87cf30deb0aeaba0887332 (diff)
Merge branch 'master' into micropeak-logging
Diffstat (limited to 'src/core/ao_packet.h')
-rw-r--r--src/core/ao_packet.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ao_packet.h b/src/core/ao_packet.h
index 0eafd3b2..08b184d6 100644
--- a/src/core/ao_packet.h
+++ b/src/core/ao_packet.h
@@ -62,7 +62,7 @@ ao_packet_flush(void);
void
ao_packet_putchar(char c) __reentrant;
-char
+int
ao_packet_pollchar(void);
#if PACKET_HAS_MASTER