From fed649d56c3433b9cb8460e3622456c3ccebd2ac Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Thu, 2 Feb 2017 11:28:34 +0000 Subject: Fixed potential name conflicts. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10079 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/lib/streams/memstreams.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'os/hal/lib/streams') diff --git a/os/hal/lib/streams/memstreams.c b/os/hal/lib/streams/memstreams.c index e8c561576..d949d1674 100644 --- a/os/hal/lib/streams/memstreams.c +++ b/os/hal/lib/streams/memstreams.c @@ -43,7 +43,7 @@ /* Driver local functions. */ /*===========================================================================*/ -static size_t writes(void *ip, const uint8_t *bp, size_t n) { +static size_t _writes(void *ip, const uint8_t *bp, size_t n) { MemoryStream *msp = ip; if (msp->size - msp->eos < n) @@ -53,7 +53,7 @@ static size_t writes(void *ip, const uint8_t *bp, size_t n) { return n; } -static size_t reads(void *ip, uint8_t *bp, size_t n) { +static size_t _reads(void *ip, uint8_t *bp, size_t n) { MemoryStream *msp = ip; if (msp->eos - msp->offset < n) @@ -63,7 +63,7 @@ static size_t reads(void *ip, uint8_t *bp, size_t n) { return n; } -static msg_t put(void *ip, uint8_t b) { +static msg_t _put(void *ip, uint8_t b) { MemoryStream *msp = ip; if (msp->size - msp->eos <= 0) @@ -73,7 +73,7 @@ static msg_t put(void *ip, uint8_t b) { return MSG_OK; } -static msg_t get(void *ip) { +static msg_t _get(void *ip) { uint8_t b; MemoryStream *msp = ip; @@ -84,7 +84,7 @@ static msg_t get(void *ip) { return b; } -static const struct MemStreamVMT vmt = {writes, reads, put, get}; +static const struct MemStreamVMT vmt = {_writes, _reads, _put, _get}; /*===========================================================================*/ /* Driver exported functions. */ -- cgit v1.2.3