Skip to content

Commit b233b5c

Browse files
committed
Merge branch 'release/v1.3.1'
2 parents 0d4ac53 + ac409ac commit b233b5c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
author = 'Tilen MAJERLE'
2828

2929
# The full version, including alpha/beta/rc tags
30-
version = '1.3.0'
30+
version = '1.3.1'
3131

3232
# Try to get branch at which this is running
3333
# and try to determine which version to display in sphinx

ringbuff/src/include/ringbuff/ringbuff.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* This file is part of ring buffer library.
3030
*
3131
* Author: Tilen MAJERLE <[email protected]>
32-
* Version: v1.3.0
32+
* Version: v1.3.1
3333
*/
3434
#ifndef RINGBUFF_HDR_H
3535
#define RINGBUFF_HDR_H
@@ -51,7 +51,7 @@ extern "C" {
5151
* \brief Enable buffer structure pointer parameter as volatile
5252
* To use this feature, uncomment keyword below
5353
*/
54-
#define RINGBUFF_VOLATILE /* volatile */
54+
#define RINGBUFF_VOLATILE /* volatile */
5555

5656
/**
5757
* \brief Event type for buffer operations
@@ -73,7 +73,7 @@ struct ringbuff;
7373
* \param[in] evt: Event type
7474
* \param[in] bp: Number of bytes written or read (when used), depends on event type
7575
*/
76-
typedef void (*ringbuff_evt_fn)(struct ringbuff* buff, ringbuff_evt_type_t evt, size_t bp);
76+
typedef void (*ringbuff_evt_fn)(RINGBUFF_VOLATILE struct ringbuff* buff, ringbuff_evt_type_t evt, size_t bp);
7777

7878
/**
7979
* \brief Buffer structure

ringbuff/src/ringbuff/ringbuff.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* This file is part of ring buffer library.
3030
*
3131
* Author: Tilen MAJERLE <[email protected]>
32-
* Version: v1.3.0
32+
* Version: v1.3.1
3333
*/
3434
#include "ringbuff/ringbuff.h"
3535

0 commit comments

Comments
 (0)