Commit e45de995 authored by Rob Swindell's avatar Rob Swindell 💬
Browse files

Finally get rid of RINGBUFCALL (finish what was started in April of this year)

Missing part of commit 4da964dd
parent 0d4953ec
/* ringbuf.h */
/* Synchronet ring buffer routines */ /* Synchronet ring buffer routines */
/* $Id: ringbuf.h,v 1.14 2018/07/24 01:11:07 rswindell Exp $ */
/**************************************************************************** /****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) * * @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) * * @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
...@@ -61,12 +57,6 @@ ...@@ -61,12 +57,6 @@
#define RINGBUF_USE_STD_RTL #define RINGBUF_USE_STD_RTL
#if defined(_WIN32) && !defined(__GNUC__)
#define RINGBUFCALL _cdecl
#else
#define RINGBUFCALL
#endif
/************/ /************/
/* Typedefs */ /* Typedefs */
/************/ /************/
...@@ -100,23 +90,23 @@ extern "C" { ...@@ -100,23 +90,23 @@ extern "C" {
/* Function Prototypes */ /* Function Prototypes */
/***********************/ /***********************/
int RINGBUFCALL RingBufInit( RingBuf* rb, DWORD size int RingBufInit( RingBuf* rb, DWORD size
#ifndef RINGBUF_USE_STD_RTL #ifndef RINGBUF_USE_STD_RTL
,void *(os_malloc)(size_t) ,void *(os_malloc)(size_t)
,void (os_free)(void *) ,void (os_free)(void *)
,void *(os_memcpy)(void *, const void *, size_t) ,void *(os_memcpy)(void *, const void *, size_t)
#endif #endif
); );
void RINGBUFCALL RingBufDispose( RingBuf* rb ); void RingBufDispose( RingBuf* rb );
DWORD RINGBUFCALL RingBufFull( RingBuf* rb ); DWORD RingBufFull( RingBuf* rb );
DWORD RINGBUFCALL RingBufFree( RingBuf* rb ); DWORD RingBufFree( RingBuf* rb );
DWORD RINGBUFCALL RingBufWrite( RingBuf* rb, const BYTE *src, DWORD cnt ); DWORD RingBufWrite( RingBuf* rb, const BYTE *src, DWORD cnt );
DWORD RINGBUFCALL RingBufRead( RingBuf* rb, BYTE *dst, DWORD cnt ); DWORD RingBufRead( RingBuf* rb, BYTE *dst, DWORD cnt );
DWORD RINGBUFCALL RingBufPeek( RingBuf* rb, BYTE *dst, DWORD cnt ); DWORD RingBufPeek( RingBuf* rb, BYTE *dst, DWORD cnt );
void RINGBUFCALL RingBufReInit( RingBuf* rb ); void RingBufReInit( RingBuf* rb );
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* Don't add anything afterthis endif */ #endif /* Don't add anything after this line */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment