From 6bb2eb9e72432013d8da678288a00437e323348d Mon Sep 17 00:00:00 2001
From: Rob Swindell <rob@synchro.net>
Date: Mon, 29 Nov 2021 18:24:19 -0800
Subject: [PATCH] Finally get rid of RINGBUFCALL (finish what was started in
April of this year)
Missing part of commit 2d3b3bce3971b2554dafd5d621b0f26a23dde1da
---
src/sbbs3/ringbuf.h | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/src/sbbs3/ringbuf.h b/src/sbbs3/ringbuf.h
index c486f2fad5..11d1d1867c 100644
--- a/src/sbbs3/ringbuf.h
+++ b/src/sbbs3/ringbuf.h
@@ -1,9 +1,5 @@
-/* ringbuf.h */
-
/* 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.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
@@ -61,12 +57,6 @@
#define RINGBUF_USE_STD_RTL
-#if defined(_WIN32) && !defined(__GNUC__)
-#define RINGBUFCALL _cdecl
-#else
-#define RINGBUFCALL
-#endif
-
/************/
/* Typedefs */
/************/
@@ -100,23 +90,23 @@ extern "C" {
/* Function Prototypes */
/***********************/
-int RINGBUFCALL RingBufInit( RingBuf* rb, DWORD size
+int RingBufInit( RingBuf* rb, DWORD size
#ifndef RINGBUF_USE_STD_RTL
,void *(os_malloc)(size_t)
,void (os_free)(void *)
,void *(os_memcpy)(void *, const void *, size_t)
#endif
);
-void RINGBUFCALL RingBufDispose( RingBuf* rb );
-DWORD RINGBUFCALL RingBufFull( RingBuf* rb );
-DWORD RINGBUFCALL RingBufFree( RingBuf* rb );
-DWORD RINGBUFCALL RingBufWrite( RingBuf* rb, const BYTE *src, DWORD cnt );
-DWORD RINGBUFCALL RingBufRead( RingBuf* rb, BYTE *dst, DWORD cnt );
-DWORD RINGBUFCALL RingBufPeek( RingBuf* rb, BYTE *dst, DWORD cnt );
-void RINGBUFCALL RingBufReInit( RingBuf* rb );
+void RingBufDispose( RingBuf* rb );
+DWORD RingBufFull( RingBuf* rb );
+DWORD RingBufFree( RingBuf* rb );
+DWORD RingBufWrite( RingBuf* rb, const BYTE *src, DWORD cnt );
+DWORD RingBufRead( RingBuf* rb, BYTE *dst, DWORD cnt );
+DWORD RingBufPeek( RingBuf* rb, BYTE *dst, DWORD cnt );
+void RingBufReInit( RingBuf* rb );
#ifdef __cplusplus
}
#endif
-#endif /* Don't add anything afterthis endif */
+#endif /* Don't add anything after this line */
--
GitLab