From 2d3b3bce3971b2554dafd5d621b0f26a23dde1da Mon Sep 17 00:00:00 2001
From: Rob Swindell <rob@synchro.net>
Date: Sun, 4 Apr 2021 18:11:45 -0700
Subject: [PATCH] The great DLLCALL purge of 2021 - part 2
---
src/conio/ansi_cio.c | 2 +-
src/conio/ciolib.c | 264 +++++++++++++++++++--------------------
src/conio/ciolib.h | 191 ++++++++++++++--------------
src/conio/cterm.c | 14 +--
src/conio/cterm.h | 56 ++++-----
src/conio/mouse.c | 32 ++---
src/encode/base64.h | 12 +-
src/encode/lzh.c | 4 +-
src/encode/lzh.h | 26 +---
src/sbbs3/ftpsrvr.h | 15 +--
src/sbbs3/js_cryptcert.h | 2 +-
src/sbbs3/js_cryptcon.h | 2 +-
src/sbbs3/ringbuf.c | 16 +--
src/sbbs3/websrvr.h | 15 +--
src/uifc/uifc.h | 10 +-
src/uifc/uifc32.c | 2 +-
src/uifc/uifcx.c | 2 +-
src/xpdev/datewrap.h | 40 ++----
src/xpdev/dirwrap.h | 68 +++++-----
src/xpdev/eventwrap.h | 16 ---
src/xpdev/filewrap.h | 16 ---
src/xpdev/genwrap.h | 83 +++++-------
src/xpdev/link_list.h | 90 ++++++-------
src/xpdev/msg_queue.h | 48 +++----
src/xpdev/multisock.h | 12 +-
src/xpdev/netwrap.h | 22 +---
src/xpdev/semfile.h | 30 ++---
src/xpdev/semwrap.h | 26 +---
src/xpdev/threadwrap.h | 49 +++-----
src/xpdev/wrapdll.h | 27 +---
src/xpdev/xp_dl.h | 4 +-
src/xpdev/xpbeep.c | 28 ++---
src/xpdev/xpbeep.h | 16 +--
src/xpdev/xpdatetime.h | 58 ++++-----
src/xpdev/xpmap.h | 20 +--
src/xpdev/xpprintf.h | 35 ++----
36 files changed, 539 insertions(+), 814 deletions(-)
diff --git a/src/conio/ansi_cio.c b/src/conio/ansi_cio.c
index a9fc2e40d3..83d4b5c70e 100644
--- a/src/conio/ansi_cio.c
+++ b/src/conio/ansi_cio.c
@@ -1019,7 +1019,7 @@ void ansi_suspend(void)
#endif
}
-CIOLIBEXPORT void CIOLIBCALL ansi_ciolib_setdoorway(int enable)
+CIOLIBEXPORT void ansi_ciolib_setdoorway(int enable)
{
if(cio_api.mode!=CIOLIB_MODE_ANSI)
return;
diff --git a/src/conio/ciolib.c b/src/conio/ciolib.c
index d9f82b9806..280c435b1f 100644
--- a/src/conio/ciolib.c
+++ b/src/conio/ciolib.c
@@ -86,62 +86,62 @@ CIOLIBEXPORT int ciolib_initial_window_height = -1;
CIOLIBEXPORT int ciolib_initial_window_width = -1;
static int initialized=0;
-CIOLIBEXPORT int CIOLIBCALL ciolib_movetext(int sx, int sy, int ex, int ey, int dx, int dy);
-CIOLIBEXPORT char * CIOLIBCALL ciolib_cgets(char *str);
-CIOLIBEXPORT int CIOLIBCALL ciolib_cscanf (char *format , ...);
-CIOLIBEXPORT int CIOLIBCALL ciolib_kbhit(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_getch(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_getche(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_ungetch(int ch);
-CIOLIBEXPORT void CIOLIBCALL ciolib_gettextinfo(struct text_info *info);
-CIOLIBEXPORT int CIOLIBCALL ciolib_wherex(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_wherey(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_wscroll(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_gotoxy(int x, int y);
-CIOLIBEXPORT void CIOLIBCALL ciolib_clreol(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_clrscr(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_cputs(char *str);
-CIOLIBEXPORT int CIOLIBCALL ciolib_cprintf(const char *fmat, ...);
-CIOLIBEXPORT void CIOLIBCALL ciolib_textbackground(int colour);
-CIOLIBEXPORT void CIOLIBCALL ciolib_textcolor(int colour);
-CIOLIBEXPORT void CIOLIBCALL ciolib_highvideo(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_lowvideo(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_normvideo(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_puttext(int a,int b,int c,int d,void *e);
-CIOLIBEXPORT int CIOLIBCALL ciolib_vmem_puttext(int a,int b,int c,int d,struct vmem_cell *e);
-CIOLIBEXPORT int CIOLIBCALL ciolib_gettext(int a,int b,int c,int d,void *e);
-CIOLIBEXPORT int CIOLIBCALL ciolib_vmem_gettext(int a,int b,int c,int d,struct vmem_cell *e);
-CIOLIBEXPORT void CIOLIBCALL ciolib_textattr(int a);
-CIOLIBEXPORT void CIOLIBCALL ciolib_delay(long a);
-CIOLIBEXPORT int CIOLIBCALL ciolib_putch(int a);
-CIOLIBEXPORT void CIOLIBCALL ciolib_setcursortype(int a);
-CIOLIBEXPORT void CIOLIBCALL ciolib_textmode(int mode);
-CIOLIBEXPORT void CIOLIBCALL ciolib_window(int sx, int sy, int ex, int ey);
-CIOLIBEXPORT void CIOLIBCALL ciolib_delline(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_insline(void);
-CIOLIBEXPORT char * CIOLIBCALL ciolib_getpass(const char *prompt);
-CIOLIBEXPORT void CIOLIBCALL ciolib_copytext(const char *text, size_t buflen);
-CIOLIBEXPORT char * CIOLIBCALL ciolib_getcliptext(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_get_window_info(int *width, int *height, int *xpos, int *ypos);
-CIOLIBEXPORT void CIOLIBCALL ciolib_setscaling(int new_value);
-CIOLIBEXPORT int CIOLIBCALL ciolib_getscaling(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_setpalette(uint32_t entry, uint16_t r, uint16_t g, uint16_t b);
-CIOLIBEXPORT int CIOLIBCALL ciolib_attr2palette(uint8_t attr, uint32_t *fg, uint32_t *bg);
-CIOLIBEXPORT int CIOLIBCALL ciolib_setpixel(uint32_t x, uint32_t y, uint32_t colour);
-CIOLIBEXPORT struct ciolib_pixels * CIOLIBCALL ciolib_getpixels(uint32_t sx, uint32_t sy, uint32_t ex, uint32_t ey, int force);
-CIOLIBEXPORT int CIOLIBCALL ciolib_setpixels(uint32_t sx, uint32_t sy, uint32_t ex, uint32_t ey, uint32_t x_off, uint32_t y_off, struct ciolib_pixels *pixels, void *mask);
-CIOLIBEXPORT void CIOLIBCALL ciolib_freepixels(struct ciolib_pixels *pixels);
-CIOLIBEXPORT struct ciolib_screen * CIOLIBCALL ciolib_savescreen(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_freescreen(struct ciolib_screen *);
-CIOLIBEXPORT int CIOLIBCALL ciolib_restorescreen(struct ciolib_screen *scrn);
-CIOLIBEXPORT void CIOLIBCALL ciolib_setcolour(uint32_t fg, uint32_t bg);
-CIOLIBEXPORT int CIOLIBCALL ciolib_get_modepalette(uint32_t p[16]);
-CIOLIBEXPORT int CIOLIBCALL ciolib_set_modepalette(uint32_t p[16]);
-CIOLIBEXPORT void CIOLIBCALL ciolib_set_vmem(struct vmem_cell *cell, uint8_t ch, uint8_t attr, uint8_t font);
-CIOLIBEXPORT void CIOLIBCALL ciolib_set_vmem_attr(struct vmem_cell *cell, uint8_t attr);
-CIOLIBEXPORT void CIOLIBCALL ciolib_setwinsize(int width, int height);
-CIOLIBEXPORT void CIOLIBCALL ciolib_setwinposition(int x, int y);
-CIOLIBEXPORT enum ciolib_codepage CIOLIBCALL ciolib_getcodepage(void);
+CIOLIBEXPORT int ciolib_movetext(int sx, int sy, int ex, int ey, int dx, int dy);
+CIOLIBEXPORT char * ciolib_cgets(char *str);
+CIOLIBEXPORT int ciolib_cscanf (char *format , ...);
+CIOLIBEXPORT int ciolib_kbhit(void);
+CIOLIBEXPORT int ciolib_getch(void);
+CIOLIBEXPORT int ciolib_getche(void);
+CIOLIBEXPORT int ciolib_ungetch(int ch);
+CIOLIBEXPORT void ciolib_gettextinfo(struct text_info *info);
+CIOLIBEXPORT int ciolib_wherex(void);
+CIOLIBEXPORT int ciolib_wherey(void);
+CIOLIBEXPORT void ciolib_wscroll(void);
+CIOLIBEXPORT void ciolib_gotoxy(int x, int y);
+CIOLIBEXPORT void ciolib_clreol(void);
+CIOLIBEXPORT void ciolib_clrscr(void);
+CIOLIBEXPORT int ciolib_cputs(char *str);
+CIOLIBEXPORT int ciolib_cprintf(const char *fmat, ...);
+CIOLIBEXPORT void ciolib_textbackground(int colour);
+CIOLIBEXPORT void ciolib_textcolor(int colour);
+CIOLIBEXPORT void ciolib_highvideo(void);
+CIOLIBEXPORT void ciolib_lowvideo(void);
+CIOLIBEXPORT void ciolib_normvideo(void);
+CIOLIBEXPORT int ciolib_puttext(int a,int b,int c,int d,void *e);
+CIOLIBEXPORT int ciolib_vmem_puttext(int a,int b,int c,int d,struct vmem_cell *e);
+CIOLIBEXPORT int ciolib_gettext(int a,int b,int c,int d,void *e);
+CIOLIBEXPORT int ciolib_vmem_gettext(int a,int b,int c,int d,struct vmem_cell *e);
+CIOLIBEXPORT void ciolib_textattr(int a);
+CIOLIBEXPORT void ciolib_delay(long a);
+CIOLIBEXPORT int ciolib_putch(int a);
+CIOLIBEXPORT void ciolib_setcursortype(int a);
+CIOLIBEXPORT void ciolib_textmode(int mode);
+CIOLIBEXPORT void ciolib_window(int sx, int sy, int ex, int ey);
+CIOLIBEXPORT void ciolib_delline(void);
+CIOLIBEXPORT void ciolib_insline(void);
+CIOLIBEXPORT char * ciolib_getpass(const char *prompt);
+CIOLIBEXPORT void ciolib_copytext(const char *text, size_t buflen);
+CIOLIBEXPORT char * ciolib_getcliptext(void);
+CIOLIBEXPORT int ciolib_get_window_info(int *width, int *height, int *xpos, int *ypos);
+CIOLIBEXPORT void ciolib_setscaling(int new_value);
+CIOLIBEXPORT int ciolib_getscaling(void);
+CIOLIBEXPORT int ciolib_setpalette(uint32_t entry, uint16_t r, uint16_t g, uint16_t b);
+CIOLIBEXPORT int ciolib_attr2palette(uint8_t attr, uint32_t *fg, uint32_t *bg);
+CIOLIBEXPORT int ciolib_setpixel(uint32_t x, uint32_t y, uint32_t colour);
+CIOLIBEXPORT struct ciolib_pixels * ciolib_getpixels(uint32_t sx, uint32_t sy, uint32_t ex, uint32_t ey, int force);
+CIOLIBEXPORT int ciolib_setpixels(uint32_t sx, uint32_t sy, uint32_t ex, uint32_t ey, uint32_t x_off, uint32_t y_off, struct ciolib_pixels *pixels, void *mask);
+CIOLIBEXPORT void ciolib_freepixels(struct ciolib_pixels *pixels);
+CIOLIBEXPORT struct ciolib_screen * ciolib_savescreen(void);
+CIOLIBEXPORT void ciolib_freescreen(struct ciolib_screen *);
+CIOLIBEXPORT int ciolib_restorescreen(struct ciolib_screen *scrn);
+CIOLIBEXPORT void ciolib_setcolour(uint32_t fg, uint32_t bg);
+CIOLIBEXPORT int ciolib_get_modepalette(uint32_t p[16]);
+CIOLIBEXPORT int ciolib_set_modepalette(uint32_t p[16]);
+CIOLIBEXPORT void ciolib_set_vmem(struct vmem_cell *cell, uint8_t ch, uint8_t attr, uint8_t font);
+CIOLIBEXPORT void ciolib_set_vmem_attr(struct vmem_cell *cell, uint8_t attr);
+CIOLIBEXPORT void ciolib_setwinsize(int width, int height);
+CIOLIBEXPORT void ciolib_setwinposition(int x, int y);
+CIOLIBEXPORT enum ciolib_codepage ciolib_getcodepage(void);
#if defined(WITH_SDL)
int sdl_video_initialized = 0;
@@ -372,7 +372,7 @@ static int try_conio_init(int mode)
#endif
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL suspendciolib(void)
+CIOLIBEXPORT void suspendciolib(void)
{
ciolib_clrscr();
if(cio_api.suspend != NULL)
@@ -380,7 +380,7 @@ CIOLIBEXPORT void CIOLIBCALL suspendciolib(void)
initialized=-1;
}
-CIOLIBEXPORT int CIOLIBCALL initciolib(int mode)
+CIOLIBEXPORT int initciolib(int mode)
{
switch(initialized) {
case 1:
@@ -473,7 +473,7 @@ CIOLIBEXPORT int CIOLIBCALL initciolib(int mode)
/*
* Returns non-zero if a key is hit
*/
-CIOLIBEXPORT int CIOLIBCALL ciolib_kbhit(void)
+CIOLIBEXPORT int ciolib_kbhit(void)
{
CIOLIB_INIT();
if(ungotch)
@@ -482,7 +482,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_kbhit(void)
}
/* **MUST** be implemented */
-CIOLIBEXPORT int CIOLIBCALL ciolib_getch(void)
+CIOLIBEXPORT int ciolib_getch(void)
{
int ch;
@@ -497,7 +497,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_getch(void)
}
/* Optional */
-CIOLIBEXPORT int CIOLIBCALL ciolib_getche(void)
+CIOLIBEXPORT int ciolib_getche(void)
{
int ch;
@@ -529,7 +529,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_getche(void)
/*
* On success, returns ch, on error, returns EOF
*/
-CIOLIBEXPORT int CIOLIBCALL ciolib_ungetch(int ch)
+CIOLIBEXPORT int ciolib_ungetch(int ch)
{
CIOLIB_INIT();
@@ -545,7 +545,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_ungetch(int ch)
/*
* Returns non-zero on success
*/
-CIOLIBEXPORT int CIOLIBCALL ciolib_movetext(int sx, int sy, int ex, int ey, int dx, int dy)
+CIOLIBEXPORT int ciolib_movetext(int sx, int sy, int ex, int ey, int dx, int dy)
{
int width;
int height;
@@ -589,7 +589,7 @@ fail:
* Returns &str[2]
* Cannot fail
*/
-CIOLIBEXPORT char * CIOLIBCALL ciolib_cgets(char *str)
+CIOLIBEXPORT char * ciolib_cgets(char *str)
{
int maxlen;
int len=0;
@@ -672,7 +672,7 @@ int vsscanf( const char *buffer, const char *format, va_list arg_ptr )
/* Can't be overridden */
/* Returns the number of fields converted */
-CIOLIBEXPORT int CIOLIBCALL ciolib_cscanf (char *format , ...)
+CIOLIBEXPORT int ciolib_cscanf (char *format , ...)
{
char str[255];
va_list argptr;
@@ -689,7 +689,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_cscanf (char *format , ...)
/* Optional */
/* So dumb */
-CIOLIBEXPORT char * CIOLIBCALL ciolib_getpass(const char *prompt)
+CIOLIBEXPORT char * ciolib_getpass(const char *prompt)
{
static char pass[9];
int len=0;
@@ -732,7 +732,7 @@ early_return:
/* TODO: Hackery here... must fix */
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_gettextinfo(struct text_info *info)
+CIOLIBEXPORT void ciolib_gettextinfo(struct text_info *info)
{
CIOLIB_INIT()
@@ -745,7 +745,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_gettextinfo(struct text_info *info)
/* Optional */
/* Not part of Borland conio? */
-CIOLIBEXPORT void CIOLIBCALL ciolib_wscroll(void)
+CIOLIBEXPORT void ciolib_wscroll(void)
{
int os;
@@ -774,7 +774,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_wscroll(void)
/* Optional */
/* Cannot fail */
-CIOLIBEXPORT int CIOLIBCALL ciolib_wherex(void)
+CIOLIBEXPORT int ciolib_wherex(void)
{
int x;
@@ -792,7 +792,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_wherex(void)
/* Optional */
/* Cannot fail */
-CIOLIBEXPORT int CIOLIBCALL ciolib_wherey(void)
+CIOLIBEXPORT int ciolib_wherey(void)
{
int y;
@@ -809,7 +809,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_wherey(void)
}
/* **MUST** be implemented */
-CIOLIBEXPORT void CIOLIBCALL ciolib_gotoxy(int x, int y)
+CIOLIBEXPORT void ciolib_gotoxy(int x, int y)
{
CIOLIB_INIT();
@@ -822,7 +822,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_gotoxy(int x, int y)
}
/* **MUST** be implemented */
-CIOLIBEXPORT void CIOLIBCALL ciolib_textmode(int mode)
+CIOLIBEXPORT void ciolib_textmode(int mode)
{
CIOLIB_INIT();
@@ -858,7 +858,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_textmode(int mode)
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_window(int sx, int sy, int ex, int ey)
+CIOLIBEXPORT void ciolib_window(int sx, int sy, int ex, int ey)
{
CIOLIB_INIT();
@@ -885,7 +885,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_window(int sx, int sy, int ex, int ey)
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_clreol(void)
+CIOLIBEXPORT void ciolib_clreol(void)
{
struct vmem_cell *buf;
int i;
@@ -920,7 +920,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_clreol(void)
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_clrscr(void)
+CIOLIBEXPORT void ciolib_clrscr(void)
{
struct vmem_cell *buf;
int i;
@@ -954,7 +954,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_clrscr(void)
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_delline(void)
+CIOLIBEXPORT void ciolib_delline(void)
{
CIOLIB_INIT();
@@ -974,7 +974,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_delline(void)
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_insline(void)
+CIOLIBEXPORT void ciolib_insline(void)
{
CIOLIB_INIT();
@@ -990,7 +990,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_insline(void)
/* Not overridable due to varargs */
/* Returns the number of characters or EOF on error */
-CIOLIBEXPORT int CIOLIBCALL ciolib_cprintf(const char *fmat, ...)
+CIOLIBEXPORT int ciolib_cprintf(const char *fmat, ...)
{
va_list argptr;
int ret;
@@ -1052,7 +1052,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_cprintf(const char *fmat, ...)
/* The Borland version does not translate \n into \r\n... this does.
* Returns last character printed (!)
*/
-CIOLIBEXPORT int CIOLIBCALL ciolib_cputs(char *str)
+CIOLIBEXPORT int ciolib_cputs(char *str)
{
int pos;
int ret=0;
@@ -1078,7 +1078,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_cputs(char *str)
}
/* Optional... and overriding is silly */
-CIOLIBEXPORT void CIOLIBCALL ciolib_textbackground(int colour)
+CIOLIBEXPORT void ciolib_textbackground(int colour)
{
unsigned char attr;
unsigned char col;
@@ -1098,7 +1098,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_textbackground(int colour)
}
/* Optional... and overriding is silly */
-CIOLIBEXPORT void CIOLIBCALL ciolib_textcolor(int colour)
+CIOLIBEXPORT void ciolib_textcolor(int colour)
{
unsigned char attr;
unsigned char col;
@@ -1118,7 +1118,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_textcolor(int colour)
}
/* Optional... and overriding is silly */
-CIOLIBEXPORT void CIOLIBCALL ciolib_highvideo(void)
+CIOLIBEXPORT void ciolib_highvideo(void)
{
int attr;
@@ -1135,7 +1135,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_highvideo(void)
}
/* Optional... and overriding is silly */
-CIOLIBEXPORT void CIOLIBCALL ciolib_lowvideo(void)
+CIOLIBEXPORT void ciolib_lowvideo(void)
{
int attr;
@@ -1152,7 +1152,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_lowvideo(void)
}
/* Optional... and overriding is silly */
-CIOLIBEXPORT void CIOLIBCALL ciolib_normvideo(void)
+CIOLIBEXPORT void ciolib_normvideo(void)
{
CIOLIB_INIT();
@@ -1167,7 +1167,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_normvideo(void)
/*
* Non-zero on success
*/
-CIOLIBEXPORT int CIOLIBCALL ciolib_puttext(int a,int b,int c,int d,void *e)
+CIOLIBEXPORT int ciolib_puttext(int a,int b,int c,int d,void *e)
{
char *buf=e;
int ret;
@@ -1181,7 +1181,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_puttext(int a,int b,int c,int d,void *e)
/* **MUST** be implemented */
/* 1 on success, 0 on failure */
-CIOLIBEXPORT int CIOLIBCALL ciolib_gettext(int a,int b,int c,int d,void *e)
+CIOLIBEXPORT int ciolib_gettext(int a,int b,int c,int d,void *e)
{
char *ch;
int i;
@@ -1208,7 +1208,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_gettext(int a,int b,int c,int d,void *e)
/* Optional */
/* 1 on success, 0 on failure */
-CIOLIBEXPORT int CIOLIBCALL ciolib_vmem_gettext(int a,int b,int c,int d,struct vmem_cell *e)
+CIOLIBEXPORT int ciolib_vmem_gettext(int a,int b,int c,int d,struct vmem_cell *e)
{
int ret;
uint16_t *buf;
@@ -1235,7 +1235,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_vmem_gettext(int a,int b,int c,int d,struct v
/* Optional */
/* Non-zero on success */
-CIOLIBEXPORT int CIOLIBCALL ciolib_vmem_puttext(int a,int b,int c,int d,struct vmem_cell *e)
+CIOLIBEXPORT int ciolib_vmem_puttext(int a,int b,int c,int d,struct vmem_cell *e)
{
int i;
int ret;
@@ -1256,7 +1256,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_vmem_puttext(int a,int b,int c,int d,struct v
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_textattr(int a)
+CIOLIBEXPORT void ciolib_textattr(int a)
{
CIOLIB_INIT();
@@ -1270,7 +1270,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_textattr(int a)
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_delay(long a)
+CIOLIBEXPORT void ciolib_delay(long a)
{
CIOLIB_INIT();
@@ -1283,7 +1283,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_delay(long a)
/* Optional */
/* Returns ch on success, EOF on error */
-CIOLIBEXPORT int CIOLIBCALL ciolib_putch(int ch)
+CIOLIBEXPORT int ciolib_putch(int ch)
{
unsigned char a1=ch;
struct vmem_cell buf[1];
@@ -1391,7 +1391,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_putch(int ch)
}
/* **MUST** be implemented */
-CIOLIBEXPORT void CIOLIBCALL ciolib_setcursortype(int a)
+CIOLIBEXPORT void ciolib_setcursortype(int a)
{
CIOLIB_INIT();
@@ -1400,7 +1400,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_setcursortype(int a)
/* Optional */
/* Return Non-zero on success */
-CIOLIBEXPORT int CIOLIBCALL ciolib_showmouse(void) {
+CIOLIBEXPORT int ciolib_showmouse(void) {
CIOLIB_INIT();
if(cio_api.showmouse!=NULL)
@@ -1410,7 +1410,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_showmouse(void) {
/* Optional */
/* Return Non-zero on success */
-CIOLIBEXPORT int CIOLIBCALL ciolib_hidemouse(void) {
+CIOLIBEXPORT int ciolib_hidemouse(void) {
CIOLIB_INIT();
if(cio_api.hidemouse!=NULL)
@@ -1419,7 +1419,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_hidemouse(void) {
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_setname(const char *name) {
+CIOLIBEXPORT void ciolib_setname(const char *name) {
CIOLIB_INIT();
if(cio_api.setname!=NULL)
@@ -1427,7 +1427,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_setname(const char *name) {
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_seticon(const void *icon, unsigned long size) {
+CIOLIBEXPORT void ciolib_seticon(const void *icon, unsigned long size) {
CIOLIB_INIT();
if(cio_api.seticon!=NULL)
@@ -1435,7 +1435,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_seticon(const void *icon, unsigned long size
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_settitle(const char *title) {
+CIOLIBEXPORT void ciolib_settitle(const char *title) {
CIOLIB_INIT();
if(cio_api.settitle!=NULL)
@@ -1443,7 +1443,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_settitle(const char *title) {
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_copytext(const char *text, size_t buflen)
+CIOLIBEXPORT void ciolib_copytext(const char *text, size_t buflen)
{
CIOLIB_INIT();
@@ -1453,7 +1453,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_copytext(const char *text, size_t buflen)
/* Optional */
/* Returns NULL on error */
-CIOLIBEXPORT char * CIOLIBCALL ciolib_getcliptext(void)
+CIOLIBEXPORT char * ciolib_getcliptext(void)
{
CIOLIB_INIT();
@@ -1465,7 +1465,7 @@ CIOLIBEXPORT char * CIOLIBCALL ciolib_getcliptext(void)
/* Optional */
/* Return Non-zero on success */
-CIOLIBEXPORT int CIOLIBCALL ciolib_setfont(int font, int force, int font_num)
+CIOLIBEXPORT int ciolib_setfont(int font, int force, int font_num)
{
CIOLIB_INIT();
@@ -1477,7 +1477,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_setfont(int font, int force, int font_num)
/* Optional */
/* Return -1 if not implemented */
-CIOLIBEXPORT int CIOLIBCALL ciolib_getfont(int font_num)
+CIOLIBEXPORT int ciolib_getfont(int font_num)
{
CIOLIB_INIT();
@@ -1489,7 +1489,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_getfont(int font_num)
/* Optional */
/* Return Non-zero on success */
-CIOLIBEXPORT int CIOLIBCALL ciolib_loadfont(char *filename)
+CIOLIBEXPORT int ciolib_loadfont(char *filename)
{
CIOLIB_INIT();
@@ -1501,7 +1501,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_loadfont(char *filename)
/* Optional */
/* Return Non-zero on success */
-CIOLIBEXPORT int CIOLIBCALL ciolib_get_window_info(int *width, int *height, int *xpos, int *ypos)
+CIOLIBEXPORT int ciolib_get_window_info(int *width, int *height, int *xpos, int *ypos)
{
CIOLIB_INIT();
@@ -1521,7 +1521,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_get_window_info(int *width, int *height, int
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_beep(void)
+CIOLIBEXPORT void ciolib_beep(void)
{
CIOLIB_INIT();
@@ -1533,7 +1533,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_beep(void)
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_getcustomcursor(int *start, int *end, int *range, int *blink, int *visible)
+CIOLIBEXPORT void ciolib_getcustomcursor(int *start, int *end, int *range, int *blink, int *visible)
{
CIOLIB_INIT();
@@ -1542,7 +1542,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_getcustomcursor(int *start, int *end, int *r
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_setcustomcursor(int start, int end, int range, int blink, int visible)
+CIOLIBEXPORT void ciolib_setcustomcursor(int start, int end, int range, int blink, int visible)
{
CIOLIB_INIT();
@@ -1551,7 +1551,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_setcustomcursor(int start, int end, int rang
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_setvideoflags(int flags)
+CIOLIBEXPORT void ciolib_setvideoflags(int flags)
{
CIOLIB_INIT();
@@ -1560,7 +1560,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_setvideoflags(int flags)
}
/* Optional */
-CIOLIBEXPORT int CIOLIBCALL ciolib_getvideoflags(void)
+CIOLIBEXPORT int ciolib_getvideoflags(void)
{
CIOLIB_INIT();
@@ -1570,7 +1570,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_getvideoflags(void)
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_setscaling(int new_value)
+CIOLIBEXPORT void ciolib_setscaling(int new_value)
{
CIOLIB_INIT();
@@ -1580,7 +1580,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_setscaling(int new_value)
/* Optional */
/* Returns zero on error */
-CIOLIBEXPORT int CIOLIBCALL ciolib_getscaling(void)
+CIOLIBEXPORT int ciolib_getscaling(void)
{
CIOLIB_INIT();
@@ -1591,7 +1591,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_getscaling(void)
/* Optional */
/* Returns non-zero on success */
-CIOLIBEXPORT int CIOLIBCALL ciolib_setpalette(uint32_t entry, uint16_t r, uint16_t g, uint16_t b)
+CIOLIBEXPORT int ciolib_setpalette(uint32_t entry, uint16_t r, uint16_t g, uint16_t b)
{
CIOLIB_INIT();
@@ -1601,7 +1601,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_setpalette(uint32_t entry, uint16_t r, uint16
}
/* Returns non-zero on success */
-CIOLIBEXPORT int CIOLIBCALL ciolib_attr2palette(uint8_t attr, uint32_t *fg, uint32_t *bg)
+CIOLIBEXPORT int ciolib_attr2palette(uint8_t attr, uint32_t *fg, uint32_t *bg)
{
CIOLIB_INIT();
@@ -1615,7 +1615,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_attr2palette(uint8_t attr, uint32_t *fg, uint
}
/* Returns non-zero on success */
-CIOLIBEXPORT int CIOLIBCALL ciolib_setpixel(uint32_t x, uint32_t y, uint32_t colour)
+CIOLIBEXPORT int ciolib_setpixel(uint32_t x, uint32_t y, uint32_t colour)
{
CIOLIB_INIT();
@@ -1625,7 +1625,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_setpixel(uint32_t x, uint32_t y, uint32_t col
}
/* Returns NULL on failure */
-CIOLIBEXPORT struct ciolib_pixels * CIOLIBCALL ciolib_getpixels(uint32_t sx, uint32_t sy, uint32_t ex, uint32_t ey, int force)
+CIOLIBEXPORT struct ciolib_pixels * ciolib_getpixels(uint32_t sx, uint32_t sy, uint32_t ex, uint32_t ey, int force)
{
CIOLIB_INIT();
@@ -1635,7 +1635,7 @@ CIOLIBEXPORT struct ciolib_pixels * CIOLIBCALL ciolib_getpixels(uint32_t sx, uin
}
/* Returns non-zero on success */
-CIOLIBEXPORT int CIOLIBCALL ciolib_setpixels(uint32_t sx, uint32_t sy, uint32_t ex, uint32_t ey, uint32_t x_off, uint32_t y_off, struct ciolib_pixels *pixels, void *mask)
+CIOLIBEXPORT int ciolib_setpixels(uint32_t sx, uint32_t sy, uint32_t ex, uint32_t ey, uint32_t x_off, uint32_t y_off, struct ciolib_pixels *pixels, void *mask)
{
CIOLIB_INIT();
@@ -1644,7 +1644,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_setpixels(uint32_t sx, uint32_t sy, uint32_t
return 0;
}
-CIOLIBEXPORT void CIOLIBCALL ciolib_freepixels(struct ciolib_pixels *pixels)
+CIOLIBEXPORT void ciolib_freepixels(struct ciolib_pixels *pixels)
{
if (pixels == NULL)
return;
@@ -1655,7 +1655,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_freepixels(struct ciolib_pixels *pixels)
}
/* Returns NULL on failure */
-CIOLIBEXPORT struct ciolib_screen * CIOLIBCALL ciolib_savescreen(void)
+CIOLIBEXPORT struct ciolib_screen * ciolib_savescreen(void)
{
struct ciolib_screen *ret;
int vmode;
@@ -1689,7 +1689,7 @@ CIOLIBEXPORT struct ciolib_screen * CIOLIBCALL ciolib_savescreen(void)
return ret;
}
-CIOLIBEXPORT void CIOLIBCALL ciolib_freescreen(struct ciolib_screen *scrn)
+CIOLIBEXPORT void ciolib_freescreen(struct ciolib_screen *scrn)
{
if (scrn == NULL)
return;
@@ -1700,7 +1700,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_freescreen(struct ciolib_screen *scrn)
}
/* Returns non-zero on success */
-CIOLIBEXPORT int CIOLIBCALL ciolib_restorescreen(struct ciolib_screen *scrn)
+CIOLIBEXPORT int ciolib_restorescreen(struct ciolib_screen *scrn)
{
struct text_info ti;
int vmode;
@@ -1727,14 +1727,14 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_restorescreen(struct ciolib_screen *scrn)
return 1;
}
-CIOLIBEXPORT void CIOLIBCALL ciolib_setcolour(uint32_t fg, uint32_t bg)
+CIOLIBEXPORT void ciolib_setcolour(uint32_t fg, uint32_t bg)
{
ciolib_fg = fg;
ciolib_bg = bg;
}
/* Returns non-zero on success */
-CIOLIBEXPORT int CIOLIBCALL ciolib_get_modepalette(uint32_t p[16])
+CIOLIBEXPORT int ciolib_get_modepalette(uint32_t p[16])
{
CIOLIB_INIT();
@@ -1744,7 +1744,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_get_modepalette(uint32_t p[16])
}
/* Returns non-zero on success */
-CIOLIBEXPORT int CIOLIBCALL ciolib_set_modepalette(uint32_t p[16])
+CIOLIBEXPORT int ciolib_set_modepalette(uint32_t p[16])
{
CIOLIB_INIT();
@@ -1754,7 +1754,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_set_modepalette(uint32_t p[16])
}
/* Returns non-zero on success */
-CIOLIBEXPORT uint32_t CIOLIBCALL ciolib_map_rgb(uint16_t r, uint16_t g, uint16_t b)
+CIOLIBEXPORT uint32_t ciolib_map_rgb(uint16_t r, uint16_t g, uint16_t b)
{
CIOLIB_INIT();
@@ -1763,7 +1763,7 @@ CIOLIBEXPORT uint32_t CIOLIBCALL ciolib_map_rgb(uint16_t r, uint16_t g, uint16_t
return 0;
}
-CIOLIBEXPORT void CIOLIBCALL ciolib_replace_font(uint8_t id, char *name, void *data, size_t size)
+CIOLIBEXPORT void ciolib_replace_font(uint8_t id, char *name, void *data, size_t size)
{
CIOLIB_INIT();
@@ -1775,7 +1775,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_replace_font(uint8_t id, char *name, void *d
free(data);
}
-CIOLIBEXPORT int CIOLIBCALL ciolib_attrfont(uint8_t attr)
+CIOLIBEXPORT int ciolib_attrfont(uint8_t attr)
{
int flags;
int font = 0;
@@ -1790,7 +1790,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_attrfont(uint8_t attr)
}
/* Returns non-zero if fontnum is supported in this mode */
-CIOLIBEXPORT int CIOLIBCALL ciolib_checkfont(int fontnum)
+CIOLIBEXPORT int ciolib_checkfont(int fontnum)
{
int vmode;
struct text_info ti;
@@ -1834,7 +1834,7 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_checkfont(int fontnum)
}
-CIOLIBEXPORT void CIOLIBCALL
+CIOLIBEXPORT void
ciolib_set_vmem(struct vmem_cell *cell, uint8_t ch, uint8_t attr, uint8_t font)
{
CIOLIB_INIT();
@@ -1846,7 +1846,7 @@ ciolib_set_vmem(struct vmem_cell *cell, uint8_t ch, uint8_t attr, uint8_t font)
ciolib_set_vmem_attr(cell, attr);
}
-CIOLIBEXPORT void CIOLIBCALL
+CIOLIBEXPORT void
ciolib_set_vmem_attr(struct vmem_cell *cell, uint8_t attr)
{
CIOLIB_INIT();
@@ -1858,7 +1858,7 @@ ciolib_set_vmem_attr(struct vmem_cell *cell, uint8_t attr)
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_setwinsize(int w, int h)
+CIOLIBEXPORT void ciolib_setwinsize(int w, int h)
{
CIOLIB_INIT();
@@ -1867,7 +1867,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_setwinsize(int w, int h)
}
/* Optional */
-CIOLIBEXPORT void CIOLIBCALL ciolib_setwinposition(int x, int y)
+CIOLIBEXPORT void ciolib_setwinposition(int x, int y)
{
CIOLIB_INIT();
@@ -1875,7 +1875,7 @@ CIOLIBEXPORT void CIOLIBCALL ciolib_setwinposition(int x, int y)
cio_api.setwinposition(x, y);
}
-CIOLIBEXPORT enum ciolib_codepage CIOLIBCALL ciolib_getcodepage(void)
+CIOLIBEXPORT enum ciolib_codepage ciolib_getcodepage(void)
{
int font = ciolib_getfont(1);
@@ -1932,7 +1932,7 @@ int main(int argc, char **argv)
#endif
/* Returns non-zero on success */
-CIOLIBEXPORT uint32_t CIOLIBCALL ciolib_mousepointer(enum ciolib_mouse_ptr type)
+CIOLIBEXPORT uint32_t ciolib_mousepointer(enum ciolib_mouse_ptr type)
{
CIOLIB_INIT();
diff --git a/src/conio/ciolib.h b/src/conio/ciolib.h
index 140836d22a..8efd529177 100644
--- a/src/conio/ciolib.h
+++ b/src/conio/ciolib.h
@@ -46,11 +46,6 @@
#endif
#ifdef _WIN32
- #ifdef __BORLANDC__
- #define CIOLIBCALL
- #else
- #define CIOLIBCALL
- #endif
#if defined(CIOLIB_IMPORTS) || defined(CIOLIB_EXPORTS)
#if defined(CIOLIB_IMPORTS)
#define CIOLIBEXPORT __declspec( dllimport )
@@ -64,11 +59,9 @@
#define CIOLIBEXPORTVAR extern
#endif
#elif defined __unix__
- #define CIOLIBCALL
#define CIOLIBEXPORT
#define CIOLIBEXPORTVAR extern
#else
- #define CIOLIBCALL
#define CIOLIBEXPORT
#define CIOLIBEXPORTVAR extern
#endif
@@ -399,86 +392,86 @@ CIOLIBEXPORTVAR int ciolib_initial_window_width;
#ifdef __cplusplus
extern "C" {
#endif
-CIOLIBEXPORT int CIOLIBCALL initciolib(int mode);
-CIOLIBEXPORT void CIOLIBCALL suspendciolib(void);
-
-CIOLIBEXPORT int CIOLIBCALL ciolib_movetext(int sx, int sy, int ex, int ey, int dx, int dy);
-CIOLIBEXPORT char * CIOLIBCALL ciolib_cgets(char *str);
-CIOLIBEXPORT int CIOLIBCALL ciolib_cscanf (char *format , ...);
-CIOLIBEXPORT int CIOLIBCALL ciolib_kbhit(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_getch(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_getche(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_ungetch(int ch);
-CIOLIBEXPORT void CIOLIBCALL ciolib_gettextinfo(struct text_info *info);
-CIOLIBEXPORT int CIOLIBCALL ciolib_wherex(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_wherey(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_wscroll(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_gotoxy(int x, int y);
-CIOLIBEXPORT void CIOLIBCALL ciolib_clreol(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_clrscr(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_cputs(char *str);
-CIOLIBEXPORT int CIOLIBCALL ciolib_cprintf(const char *fmat, ...);
-CIOLIBEXPORT void CIOLIBCALL ciolib_textbackground(int colour);
-CIOLIBEXPORT void CIOLIBCALL ciolib_textcolor(int colour);
-CIOLIBEXPORT void CIOLIBCALL ciolib_highvideo(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_lowvideo(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_normvideo(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_puttext(int a,int b,int c,int d,void *e);
-CIOLIBEXPORT int CIOLIBCALL ciolib_vmem_puttext(int a,int b,int c,int d,struct vmem_cell *e);
-CIOLIBEXPORT int CIOLIBCALL ciolib_gettext(int a,int b,int c,int d,void *e);
-CIOLIBEXPORT int CIOLIBCALL ciolib_vmem_gettext(int a,int b,int c,int d,struct vmem_cell *e);
-CIOLIBEXPORT void CIOLIBCALL ciolib_textattr(int a);
-CIOLIBEXPORT void CIOLIBCALL ciolib_delay(long a);
-CIOLIBEXPORT int CIOLIBCALL ciolib_putch(int a);
-CIOLIBEXPORT void CIOLIBCALL ciolib_setcursortype(int a);
-CIOLIBEXPORT void CIOLIBCALL ciolib_textmode(int mode);
-CIOLIBEXPORT void CIOLIBCALL ciolib_window(int sx, int sy, int ex, int ey);
-CIOLIBEXPORT void CIOLIBCALL ciolib_delline(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_insline(void);
-CIOLIBEXPORT char * CIOLIBCALL ciolib_getpass(const char *prompt);
-CIOLIBEXPORT void CIOLIBCALL ciolib_settitle(const char *title);
-CIOLIBEXPORT void CIOLIBCALL ciolib_setname(const char *title);
-CIOLIBEXPORT void CIOLIBCALL ciolib_seticon(const void *icon,unsigned long size);
-CIOLIBEXPORT int CIOLIBCALL ciolib_showmouse(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_hidemouse(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_mousepointeer(enum ciolib_mouse_ptr);
-CIOLIBEXPORT void CIOLIBCALL ciolib_copytext(const char *text, size_t buflen);
-CIOLIBEXPORT char * CIOLIBCALL ciolib_getcliptext(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_setfont(int font, int force, int font_num);
-CIOLIBEXPORT int CIOLIBCALL ciolib_getfont(int font_num);
-CIOLIBEXPORT int CIOLIBCALL ciolib_loadfont(char *filename);
-CIOLIBEXPORT int CIOLIBCALL ciolib_get_window_info(int *width, int *height, int *xpos, int *ypos);
-CIOLIBEXPORT void CIOLIBCALL ciolib_beep(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_getcustomcursor(int *startline, int *endline, int *range, int *blink, int *visible);
-CIOLIBEXPORT void CIOLIBCALL ciolib_setcustomcursor(int startline, int endline, int range, int blink, int visible);
-CIOLIBEXPORT void CIOLIBCALL ciolib_setvideoflags(int flags);
-CIOLIBEXPORT int CIOLIBCALL ciolib_getvideoflags(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_setscaling(int flags);
-CIOLIBEXPORT int CIOLIBCALL ciolib_getscaling(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_setpalette(uint32_t entry, uint16_t r, uint16_t g, uint16_t b);
-CIOLIBEXPORT int CIOLIBCALL ciolib_attr2palette(uint8_t attr, uint32_t *fg, uint32_t *bg);
-CIOLIBEXPORT int CIOLIBCALL ciolib_setpixel(uint32_t x, uint32_t y, uint32_t colour);
-CIOLIBEXPORT struct ciolib_pixels * CIOLIBCALL ciolib_getpixels(uint32_t sx, uint32_t sy, uint32_t ex, uint32_t ey, int force);
-CIOLIBEXPORT int CIOLIBCALL ciolib_setpixels(uint32_t sx, uint32_t sy, uint32_t ex, uint32_t ey, uint32_t x_off, uint32_t y_off, struct ciolib_pixels *pixels, void *mask);
-CIOLIBEXPORT void CIOLIBCALL ciolib_freepixels(struct ciolib_pixels *pixels);
-CIOLIBEXPORT struct ciolib_screen * CIOLIBCALL ciolib_savescreen(void);
-CIOLIBEXPORT void CIOLIBCALL ciolib_freescreen(struct ciolib_screen *);
-CIOLIBEXPORT int CIOLIBCALL ciolib_restorescreen(struct ciolib_screen *scrn);
-CIOLIBEXPORT void CIOLIBCALL ciolib_setcolour(uint32_t fg, uint32_t bg);
-CIOLIBEXPORT int CIOLIBCALL ciolib_get_modepalette(uint32_t[16]);
-CIOLIBEXPORT int CIOLIBCALL ciolib_set_modepalette(uint32_t[16]);
-CIOLIBEXPORT uint32_t CIOLIBCALL ciolib_map_rgb(uint16_t r, uint16_t g, uint16_t b);
-CIOLIBEXPORT void CIOLIBCALL ciolib_replace_font(uint8_t id, char *name, void *data, size_t size);
-CIOLIBEXPORT int CIOLIBCALL ciolib_attrfont(uint8_t attr);
-CIOLIBEXPORT int CIOLIBCALL ciolib_checkfont(int font_num);
-CIOLIBEXPORT void CIOLIBCALL ciolib_set_vmem(struct vmem_cell *cell, uint8_t ch, uint8_t attr, uint8_t font);
-CIOLIBEXPORT void CIOLIBCALL ciolib_set_vmem_attr(struct vmem_cell *cell, uint8_t attr);
-CIOLIBEXPORT void CIOLIBCALL ciolib_setwinsize(int width, int height);
-CIOLIBEXPORT void CIOLIBCALL ciolib_setwinposition(int x, int y);
-CIOLIBEXPORT enum ciolib_codepage CIOLIBCALL ciolib_getcodepage(void);
+CIOLIBEXPORT int initciolib(int mode);
+CIOLIBEXPORT void suspendciolib(void);
+
+CIOLIBEXPORT int ciolib_movetext(int sx, int sy, int ex, int ey, int dx, int dy);
+CIOLIBEXPORT char * ciolib_cgets(char *str);
+CIOLIBEXPORT int ciolib_cscanf (char *format , ...);
+CIOLIBEXPORT int ciolib_kbhit(void);
+CIOLIBEXPORT int ciolib_getch(void);
+CIOLIBEXPORT int ciolib_getche(void);
+CIOLIBEXPORT int ciolib_ungetch(int ch);
+CIOLIBEXPORT void ciolib_gettextinfo(struct text_info *info);
+CIOLIBEXPORT int ciolib_wherex(void);
+CIOLIBEXPORT int ciolib_wherey(void);
+CIOLIBEXPORT void ciolib_wscroll(void);
+CIOLIBEXPORT void ciolib_gotoxy(int x, int y);
+CIOLIBEXPORT void ciolib_clreol(void);
+CIOLIBEXPORT void ciolib_clrscr(void);
+CIOLIBEXPORT int ciolib_cputs(char *str);
+CIOLIBEXPORT int ciolib_cprintf(const char *fmat, ...);
+CIOLIBEXPORT void ciolib_textbackground(int colour);
+CIOLIBEXPORT void ciolib_textcolor(int colour);
+CIOLIBEXPORT void ciolib_highvideo(void);
+CIOLIBEXPORT void ciolib_lowvideo(void);
+CIOLIBEXPORT void ciolib_normvideo(void);
+CIOLIBEXPORT int ciolib_puttext(int a,int b,int c,int d,void *e);
+CIOLIBEXPORT int ciolib_vmem_puttext(int a,int b,int c,int d,struct vmem_cell *e);
+CIOLIBEXPORT int ciolib_gettext(int a,int b,int c,int d,void *e);
+CIOLIBEXPORT int ciolib_vmem_gettext(int a,int b,int c,int d,struct vmem_cell *e);
+CIOLIBEXPORT void ciolib_textattr(int a);
+CIOLIBEXPORT void ciolib_delay(long a);
+CIOLIBEXPORT int ciolib_putch(int a);
+CIOLIBEXPORT void ciolib_setcursortype(int a);
+CIOLIBEXPORT void ciolib_textmode(int mode);
+CIOLIBEXPORT void ciolib_window(int sx, int sy, int ex, int ey);
+CIOLIBEXPORT void ciolib_delline(void);
+CIOLIBEXPORT void ciolib_insline(void);
+CIOLIBEXPORT char * ciolib_getpass(const char *prompt);
+CIOLIBEXPORT void ciolib_settitle(const char *title);
+CIOLIBEXPORT void ciolib_setname(const char *title);
+CIOLIBEXPORT void ciolib_seticon(const void *icon,unsigned long size);
+CIOLIBEXPORT int ciolib_showmouse(void);
+CIOLIBEXPORT int ciolib_hidemouse(void);
+CIOLIBEXPORT int ciolib_mousepointeer(enum ciolib_mouse_ptr);
+CIOLIBEXPORT void ciolib_copytext(const char *text, size_t buflen);
+CIOLIBEXPORT char * ciolib_getcliptext(void);
+CIOLIBEXPORT int ciolib_setfont(int font, int force, int font_num);
+CIOLIBEXPORT int ciolib_getfont(int font_num);
+CIOLIBEXPORT int ciolib_loadfont(char *filename);
+CIOLIBEXPORT int ciolib_get_window_info(int *width, int *height, int *xpos, int *ypos);
+CIOLIBEXPORT void ciolib_beep(void);
+CIOLIBEXPORT void ciolib_getcustomcursor(int *startline, int *endline, int *range, int *blink, int *visible);
+CIOLIBEXPORT void ciolib_setcustomcursor(int startline, int endline, int range, int blink, int visible);
+CIOLIBEXPORT void ciolib_setvideoflags(int flags);
+CIOLIBEXPORT int ciolib_getvideoflags(void);
+CIOLIBEXPORT void ciolib_setscaling(int flags);
+CIOLIBEXPORT int ciolib_getscaling(void);
+CIOLIBEXPORT int ciolib_setpalette(uint32_t entry, uint16_t r, uint16_t g, uint16_t b);
+CIOLIBEXPORT int ciolib_attr2palette(uint8_t attr, uint32_t *fg, uint32_t *bg);
+CIOLIBEXPORT int ciolib_setpixel(uint32_t x, uint32_t y, uint32_t colour);
+CIOLIBEXPORT struct ciolib_pixels * ciolib_getpixels(uint32_t sx, uint32_t sy, uint32_t ex, uint32_t ey, int force);
+CIOLIBEXPORT int ciolib_setpixels(uint32_t sx, uint32_t sy, uint32_t ex, uint32_t ey, uint32_t x_off, uint32_t y_off, struct ciolib_pixels *pixels, void *mask);
+CIOLIBEXPORT void ciolib_freepixels(struct ciolib_pixels *pixels);
+CIOLIBEXPORT struct ciolib_screen * ciolib_savescreen(void);
+CIOLIBEXPORT void ciolib_freescreen(struct ciolib_screen *);
+CIOLIBEXPORT int ciolib_restorescreen(struct ciolib_screen *scrn);
+CIOLIBEXPORT void ciolib_setcolour(uint32_t fg, uint32_t bg);
+CIOLIBEXPORT int ciolib_get_modepalette(uint32_t[16]);
+CIOLIBEXPORT int ciolib_set_modepalette(uint32_t[16]);
+CIOLIBEXPORT uint32_t ciolib_map_rgb(uint16_t r, uint16_t g, uint16_t b);
+CIOLIBEXPORT void ciolib_replace_font(uint8_t id, char *name, void *data, size_t size);
+CIOLIBEXPORT int ciolib_attrfont(uint8_t attr);
+CIOLIBEXPORT int ciolib_checkfont(int font_num);
+CIOLIBEXPORT void ciolib_set_vmem(struct vmem_cell *cell, uint8_t ch, uint8_t attr, uint8_t font);
+CIOLIBEXPORT void ciolib_set_vmem_attr(struct vmem_cell *cell, uint8_t attr);
+CIOLIBEXPORT void ciolib_setwinsize(int width, int height);
+CIOLIBEXPORT void ciolib_setwinposition(int x, int y);
+CIOLIBEXPORT enum ciolib_codepage ciolib_getcodepage(void);
/* DoorWay specific stuff that's only applicable to ANSI mode. */
-CIOLIBEXPORT void CIOLIBCALL ansi_ciolib_setdoorway(int enable);
+CIOLIBEXPORT void ansi_ciolib_setdoorway(int enable);
#ifdef __cplusplus
}
#endif
@@ -657,21 +650,21 @@ extern int ciolib_mouse_initialized;
#ifdef __cplusplus
extern "C" {
#endif
-CIOLIBEXPORT void CIOLIBCALL ciomouse_gotevent(int event, int x, int y, int x_res, int y_res);
-CIOLIBEXPORT int CIOLIBCALL mouse_trywait(void);
-CIOLIBEXPORT int CIOLIBCALL mouse_wait(void);
-CIOLIBEXPORT int CIOLIBCALL mouse_pending(void);
-CIOLIBEXPORT int CIOLIBCALL ciolib_getmouse(struct mouse_event *mevent);
-CIOLIBEXPORT int CIOLIBCALL ciolib_ungetmouse(struct mouse_event *mevent);
+CIOLIBEXPORT void ciomouse_gotevent(int event, int x, int y, int x_res, int y_res);
+CIOLIBEXPORT int mouse_trywait(void);
+CIOLIBEXPORT int mouse_wait(void);
+CIOLIBEXPORT int mouse_pending(void);
+CIOLIBEXPORT int ciolib_getmouse(struct mouse_event *mevent);
+CIOLIBEXPORT int ciolib_ungetmouse(struct mouse_event *mevent);
CIOLIBEXPORT void ciolib_mouse_thread(void *data);
-CIOLIBEXPORT uint64_t CIOLIBCALL ciomouse_setevents(uint64_t events);
-CIOLIBEXPORT uint64_t CIOLIBCALL ciomouse_addevents(uint64_t events);
-CIOLIBEXPORT uint64_t CIOLIBCALL ciomouse_delevents(uint64_t events);
-CIOLIBEXPORT uint64_t CIOLIBCALL ciomouse_addevent(uint64_t event);
-CIOLIBEXPORT uint64_t CIOLIBCALL ciomouse_delevent(uint64_t event);
-CIOLIBEXPORT uint32_t CIOLIBCALL ciolib_mousepointer(enum ciolib_mouse_ptr type);
-CIOLIBEXPORT void CIOLIBCALL mousestate(int *x, int *y, uint8_t *buttons);
-CIOLIBEXPORT void CIOLIBCALL mousestate_res(int *x_res, int *y_res, uint8_t *buttons);
+CIOLIBEXPORT uint64_t ciomouse_setevents(uint64_t events);
+CIOLIBEXPORT uint64_t ciomouse_addevents(uint64_t events);
+CIOLIBEXPORT uint64_t ciomouse_delevents(uint64_t events);
+CIOLIBEXPORT uint64_t ciomouse_addevent(uint64_t event);
+CIOLIBEXPORT uint64_t ciomouse_delevent(uint64_t event);
+CIOLIBEXPORT uint32_t ciolib_mousepointer(enum ciolib_mouse_ptr type);
+CIOLIBEXPORT void mousestate(int *x, int *y, uint8_t *buttons);
+CIOLIBEXPORT void mousestate_res(int *x_res, int *y_res, uint8_t *buttons);
#ifdef __cplusplus
}
#endif
diff --git a/src/conio/cterm.c b/src/conio/cterm.c
index 891d0d715f..718d9b41dd 100644
--- a/src/conio/cterm.c
+++ b/src/conio/cterm.c
@@ -1270,7 +1270,7 @@ clear2bol(struct cterminal * cterm)
free(buf);
}
-void CIOLIBCALL
+void
cterm_clearscreen(struct cterminal *cterm, char attr)
{
int getw;
@@ -4389,7 +4389,7 @@ cterm_reset(struct cterminal *cterm)
}
}
-struct cterminal* CIOLIBCALL cterm_init(int height, int width, int xpos, int ypos, int backlines, int backcols, struct vmem_cell *scrollback, int emulation)
+struct cterminal* cterm_init(int height, int width, int xpos, int ypos, int backlines, int backcols, struct vmem_cell *scrollback, int emulation)
{
char *revision="$Revision: 1.314 $";
char *in;
@@ -4461,7 +4461,7 @@ struct cterminal* CIOLIBCALL cterm_init(int height, int width, int xpos, int ypo
return cterm;
}
-void CIOLIBCALL cterm_start(struct cterminal *cterm)
+void cterm_start(struct cterminal *cterm)
{
struct text_info ti;
@@ -4758,7 +4758,7 @@ static void parse_macro_intro(struct cterminal *cterm)
#define uctputs(c, p) ctputs(c, (char *)p)
#define ustrcat(b, s) strcat((char *)b, (const char *)s)
-CIOLIBEXPORT char* CIOLIBCALL cterm_write(struct cterminal * cterm, const void *vbuf, int buflen, char *retbuf, size_t retsize, int *speed)
+CIOLIBEXPORT char* cterm_write(struct cterminal * cterm, const void *vbuf, int buflen, char *retbuf, size_t retsize, int *speed)
{
const unsigned char *buf = (unsigned char *)vbuf;
unsigned char ch[2];
@@ -5541,7 +5541,7 @@ CIOLIBEXPORT char* CIOLIBCALL cterm_write(struct cterminal * cterm, const void *
return(retbuf);
}
-int CIOLIBCALL cterm_openlog(struct cterminal *cterm, char *logfile, int logtype)
+int cterm_openlog(struct cterminal *cterm, char *logfile, int logtype)
{
if(!cterm->started)
cterm_start(cterm);
@@ -5553,7 +5553,7 @@ int CIOLIBCALL cterm_openlog(struct cterminal *cterm, char *logfile, int logtype
return(1);
}
-void CIOLIBCALL cterm_closelog(struct cterminal *cterm)
+void cterm_closelog(struct cterminal *cterm)
{
if(!cterm->started)
cterm_start(cterm);
@@ -5565,7 +5565,7 @@ void CIOLIBCALL cterm_closelog(struct cterminal *cterm)
}
FILE *dbg;
-void CIOLIBCALL cterm_end(struct cterminal *cterm)
+void cterm_end(struct cterminal *cterm)
{
int i;
diff --git a/src/conio/cterm.h b/src/conio/cterm.h
index cceecc19d8..ee5dfc09f5 100644
--- a/src/conio/cterm.h
+++ b/src/conio/cterm.h
@@ -241,27 +241,27 @@ struct cterminal {
int (*ciolib_cputs) (struct cterminal *,char *);
int (*ciolib_setfont) (struct cterminal *,int font, int force, int font_num);
#else
- void CIOLIBCALL (*ciolib_gotoxy) (int,int);
- int CIOLIBCALL (*ciolib_wherex) (void);
- int CIOLIBCALL (*ciolib_wherey) (void);
- int CIOLIBCALL (*ciolib_gettext) (int,int,int,int,void *);
- int CIOLIBCALL (*ciolib_vmem_gettext) (int,int,int,int,struct vmem_cell *);
- void CIOLIBCALL (*ciolib_gettextinfo) (struct text_info *);
- void CIOLIBCALL (*ciolib_textattr) (int);
- void CIOLIBCALL (*ciolib_setcursortype) (int);
- int CIOLIBCALL (*ciolib_movetext) (int,int,int,int,int,int);
- void CIOLIBCALL (*ciolib_clreol) (void);
- void CIOLIBCALL (*ciolib_clrscr) (void);
- void CIOLIBCALL (*ciolib_setvideoflags) (int flags);
- int CIOLIBCALL (*ciolib_getvideoflags) (void);
- void CIOLIBCALL (*ciolib_setscaling) (int new_value);
- int CIOLIBCALL (*ciolib_getscaling) (void);
- int CIOLIBCALL (*ciolib_putch) (int);
- int CIOLIBCALL (*ciolib_puttext) (int,int,int,int,void *);
- int CIOLIBCALL (*ciolib_vmem_puttext) (int,int,int,int,struct vmem_cell *);
- void CIOLIBCALL (*ciolib_window) (int,int,int,int);
- int CIOLIBCALL (*ciolib_cputs) (char *);
- int CIOLIBCALL (*ciolib_setfont) (int font, int force, int font_num);
+ void (*ciolib_gotoxy) (int,int);
+ int (*ciolib_wherex) (void);
+ int (*ciolib_wherey) (void);
+ int (*ciolib_gettext) (int,int,int,int,void *);
+ int (*ciolib_vmem_gettext) (int,int,int,int,struct vmem_cell *);
+ void (*ciolib_gettextinfo) (struct text_info *);
+ void (*ciolib_textattr) (int);
+ void (*ciolib_setcursortype) (int);
+ int (*ciolib_movetext) (int,int,int,int,int,int);
+ void (*ciolib_clreol) (void);
+ void (*ciolib_clrscr) (void);
+ void (*ciolib_setvideoflags) (int flags);
+ int (*ciolib_getvideoflags) (void);
+ void (*ciolib_setscaling) (int new_value);
+ int (*ciolib_getscaling) (void);
+ int (*ciolib_putch) (int);
+ int (*ciolib_puttext) (int,int,int,int,void *);
+ int (*ciolib_vmem_puttext) (int,int,int,int,struct vmem_cell *);
+ void (*ciolib_window) (int,int,int,int);
+ int (*ciolib_cputs) (char *);
+ int (*ciolib_setfont) (int font, int force, int font_num);
#endif
int *_wscroll;
int *puttext_can_move;
@@ -273,13 +273,13 @@ struct cterminal {
extern "C" {
#endif
-CIOLIBEXPORT struct cterminal* CIOLIBCALL cterm_init(int height, int width, int xpos, int ypos, int backlines, int backcols, struct vmem_cell *scrollback, int emulation);
-CIOLIBEXPORT char* CIOLIBCALL cterm_write(struct cterminal *cterm, const void *buf, int buflen, char *retbuf, size_t retsize, int *speed);
-CIOLIBEXPORT int CIOLIBCALL cterm_openlog(struct cterminal *cterm, char *logfile, int logtype);
-CIOLIBEXPORT void CIOLIBCALL cterm_closelog(struct cterminal *cterm);
-CIOLIBEXPORT void CIOLIBCALL cterm_end(struct cterminal *cterm);
-CIOLIBEXPORT void CIOLIBCALL cterm_clearscreen(struct cterminal *cterm, char attr);
-CIOLIBEXPORT void CIOLIBCALL cterm_start(struct cterminal *cterm);
+CIOLIBEXPORT struct cterminal* cterm_init(int height, int width, int xpos, int ypos, int backlines, int backcols, struct vmem_cell *scrollback, int emulation);
+CIOLIBEXPORT char* cterm_write(struct cterminal *cterm, const void *buf, int buflen, char *retbuf, size_t retsize, int *speed);
+CIOLIBEXPORT int cterm_openlog(struct cterminal *cterm, char *logfile, int logtype);
+CIOLIBEXPORT void cterm_closelog(struct cterminal *cterm);
+CIOLIBEXPORT void cterm_end(struct cterminal *cterm);
+CIOLIBEXPORT void cterm_clearscreen(struct cterminal *cterm, char attr);
+CIOLIBEXPORT void cterm_start(struct cterminal *cterm);
void cterm_gotoxy(struct cterminal *cterm, int x, int y);
void setwindow(struct cterminal *cterm);
void cterm_clreol(struct cterminal *cterm);
diff --git a/src/conio/mouse.c b/src/conio/mouse.c
index b542195195..423016dff3 100644
--- a/src/conio/mouse.c
+++ b/src/conio/mouse.c
@@ -110,7 +110,7 @@ int ciolib_mouse_initialized=0;
static int ungot=0;
pthread_mutex_t unget_mutex;
-void CIOLIBCALL init_mouse(void)
+void init_mouse(void)
{
memset(&state,0,sizeof(state));
state.click_timeout=0;
@@ -121,7 +121,7 @@ void CIOLIBCALL init_mouse(void)
ciolib_mouse_initialized=1;
}
-void CIOLIBCALL mousestate(int *x, int *y, uint8_t *buttons)
+void mousestate(int *x, int *y, uint8_t *buttons)
{
if (!ciolib_mouse_initialized) {
if (x)
@@ -139,7 +139,7 @@ void CIOLIBCALL mousestate(int *x, int *y, uint8_t *buttons)
return;
}
-void CIOLIBCALL mousestate_res(int *x, int *y, uint8_t *buttons)
+void mousestate_res(int *x, int *y, uint8_t *buttons)
{
if (!ciolib_mouse_initialized) {
if (x)
@@ -157,37 +157,37 @@ void CIOLIBCALL mousestate_res(int *x, int *y, uint8_t *buttons)
return;
}
-uint64_t CIOLIBCALL ciomouse_setevents(uint64_t events)
+uint64_t ciomouse_setevents(uint64_t events)
{
mouse_events=events;
return mouse_events;
}
-uint64_t CIOLIBCALL ciomouse_addevents(uint64_t events)
+uint64_t ciomouse_addevents(uint64_t events)
{
mouse_events |= events;
return mouse_events;
}
-uint64_t CIOLIBCALL ciomouse_delevents(uint64_t events)
+uint64_t ciomouse_delevents(uint64_t events)
{
mouse_events &= ~events;
return mouse_events;
}
-uint64_t CIOLIBCALL ciomouse_addevent(uint64_t event)
+uint64_t ciomouse_addevent(uint64_t event)
{
mouse_events |= (UINT64_C(1)<<event);
return mouse_events;
}
-uint64_t CIOLIBCALL ciomouse_delevent(uint64_t event)
+uint64_t ciomouse_delevent(uint64_t event)
{
mouse_events &= ~(UINT64_C(1)<<event);
return mouse_events;
}
-void CIOLIBCALL ciomouse_gotevent(int event, int x, int y, int x_res, int y_res)
+void ciomouse_gotevent(int event, int x, int y, int x_res, int y_res)
{
struct in_mouse_event *ime;
@@ -207,7 +207,7 @@ void CIOLIBCALL ciomouse_gotevent(int event, int x, int y, int x_res, int y_res)
}
}
-void CIOLIBCALL add_outevent(int event, int x, int y, int xres, int yres)
+void add_outevent(int event, int x, int y, int xres, int yres)
{
struct out_mouse_event *ome;
int but;
@@ -236,7 +236,7 @@ void CIOLIBCALL add_outevent(int event, int x, int y, int xres, int yres)
}
}
-int CIOLIBCALL more_multies(int button, int clicks)
+int more_multies(int button, int clicks)
{
switch(clicks) {
case 0:
@@ -516,7 +516,7 @@ void ciolib_mouse_thread(void *data)
}
}
-int CIOLIBCALL mouse_trywait(void)
+int mouse_trywait(void)
{
int result;
@@ -534,7 +534,7 @@ int CIOLIBCALL mouse_trywait(void)
}
}
-int CIOLIBCALL mouse_wait(void)
+int mouse_wait(void)
{
int result;
@@ -552,14 +552,14 @@ int CIOLIBCALL mouse_wait(void)
}
}
-int CIOLIBCALL mouse_pending(void)
+int mouse_pending(void)
{
while(!ciolib_mouse_initialized)
SLEEP(1);
return(listCountNodes(&state.output));
}
-int CIOLIBCALL ciolib_getmouse(struct mouse_event *mevent)
+int ciolib_getmouse(struct mouse_event *mevent)
{
int retval=0;
@@ -594,7 +594,7 @@ int CIOLIBCALL ciolib_getmouse(struct mouse_event *mevent)
return(retval);
}
-int CIOLIBCALL ciolib_ungetmouse(struct mouse_event *mevent)
+int ciolib_ungetmouse(struct mouse_event *mevent)
{
struct mouse_event *me;
diff --git a/src/encode/base64.h b/src/encode/base64.h
index cebc4aca53..f40da0309d 100644
--- a/src/encode/base64.h
+++ b/src/encode/base64.h
@@ -42,25 +42,19 @@
#else
#define B64EXPORT __declspec(dllexport)
#endif
- #if defined(__BORLANDC__)
- #define B64CALL
- #else
- #define B64CALL
- #endif
#else /* !_WIN32 */
#define B64EXPORT
- #define B64CALL
#endif
#ifdef __cplusplus
extern "C" {
#endif
-B64EXPORT int B64CALL b64_encode(char *target, size_t tlen, const char *source, size_t slen);
-B64EXPORT int B64CALL b64_decode(char *target, size_t tlen, const char *source, size_t slen);
+B64EXPORT int b64_encode(char *target, size_t tlen, const char *source, size_t slen);
+B64EXPORT int b64_decode(char *target, size_t tlen, const char *source, size_t slen);
#ifdef __cplusplus
}
#endif
-#endif /* Don't add anything after this line */
\ No newline at end of file
+#endif /* Don't add anything after this line */
diff --git a/src/encode/lzh.c b/src/encode/lzh.c
index ee44538345..ac863358d3 100644
--- a/src/encode/lzh.c
+++ b/src/encode/lzh.c
@@ -558,7 +558,7 @@ static short int lzh_decode_position(lzh_t* lzh, uint8_t *inbuf, int32_t *incnt,
/* Encoding/Compressing */
/* Returns length of outbuf */
-int32_t LZHCALL lzh_encode(uint8_t *inbuf, int32_t inlen, uint8_t *outbuf)
+int32_t lzh_encode(uint8_t *inbuf, int32_t inlen, uint8_t *outbuf)
{
short int i, c, len, r, s, last_match_length;
int32_t incnt,outlen; /* textsize=0; */
@@ -688,7 +688,7 @@ int32_t LZHCALL lzh_encode(uint8_t *inbuf, int32_t inlen, uint8_t *outbuf)
/* Decoding/Uncompressing */
/* Returns length of outbuf */
-int32_t LZHCALL lzh_decode(uint8_t *inbuf, int32_t inlen, uint8_t *outbuf)
+int32_t lzh_decode(uint8_t *inbuf, int32_t inlen, uint8_t *outbuf)
{
short int i, j, k, r, c;
uint32_t count;
diff --git a/src/encode/lzh.h b/src/encode/lzh.h
index 81f70b7785..9776651f86 100644
--- a/src/encode/lzh.h
+++ b/src/encode/lzh.h
@@ -1,9 +1,5 @@
-/* lzh.h */
-
/* Synchronet LZH compression library */
-/* $Id: lzh.h,v 1.13 2019/03/22 21:29:12 rswindell Exp $ */
-
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
@@ -16,18 +12,6 @@
* Anonymous FTP access to the most recent released source is available at *
* ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
* *
- * Anonymous CVS access to the development source and modification history *
- * is available at cvs.synchro.net:/cvsroot/sbbs, example: *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
- * (just hit return, no password is necessary) *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
- * *
- * For Synchronet coding style and modification guidelines, see *
- * http://www.synchro.net/source.html *
- * *
- * You are encouraged to submit any modifications (preferably in Unix diff *
- * format) via e-mail to mods@synchro.net *
- * *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
@@ -39,11 +23,6 @@
#endif
#ifdef _WIN32
- #ifdef __BORLANDC__
- #define LZHCALL
- #else
- #define LZHCALL
- #endif
#ifdef LZHDLL /* LZH functions in DLL */
#ifdef LZH_EXPORTS
#define LZHEXPORT __declspec( dllexport )
@@ -54,7 +33,6 @@
#define LZHEXPORT
#endif
#else /* !_WIN32 */
- #define LZHCALL
#define LZHEXPORT
#endif
@@ -63,8 +41,8 @@
#ifdef __cplusplus
extern "C" {
#endif
-LZHEXPORT int32_t LZHCALL lzh_encode(uint8_t *inbuf, int32_t inlen, uint8_t *outbuf);
-LZHEXPORT int32_t LZHCALL lzh_decode(uint8_t *inbuf, int32_t inlen, uint8_t *outbuf);
+LZHEXPORT int32_t lzh_encode(uint8_t *inbuf, int32_t inlen, uint8_t *outbuf);
+LZHEXPORT int32_t lzh_decode(uint8_t *inbuf, int32_t inlen, uint8_t *outbuf);
#ifdef __cplusplus
}
#endif
diff --git a/src/sbbs3/ftpsrvr.h b/src/sbbs3/ftpsrvr.h
index acf8c11b69..cd98196ad1 100644
--- a/src/sbbs3/ftpsrvr.h
+++ b/src/sbbs3/ftpsrvr.h
@@ -139,9 +139,6 @@ static ini_bitdesc_t ftp_options[] = {
#ifdef DLLEXPORT
#undef DLLEXPORT
#endif
-#ifdef DLLCALL
-#undef DLLCALL
-#endif
#ifdef _WIN32
#ifdef FTPSRVR_EXPORTS
@@ -149,23 +146,17 @@ static ini_bitdesc_t ftp_options[] = {
#else
#define DLLEXPORT __declspec(dllimport)
#endif
- #ifdef __BORLANDC__
- #define DLLCALL
- #else
- #define DLLCALL
- #endif
#else
#define DLLEXPORT
- #define DLLCALL
#endif
#ifdef __cplusplus
extern "C" {
#endif
/* arg is pointer to static ftp_startup_t */
-DLLEXPORT void DLLCALL ftp_server(void* arg);
-DLLEXPORT void DLLCALL ftp_terminate(void);
-DLLEXPORT const char* DLLCALL ftp_ver(void);
+DLLEXPORT void ftp_server(void* arg);
+DLLEXPORT void ftp_terminate(void);
+DLLEXPORT const char* ftp_ver(void);
#ifdef __cplusplus
}
#endif
diff --git a/src/sbbs3/js_cryptcert.h b/src/sbbs3/js_cryptcert.h
index 8e48bfda42..c91cd50eac 100644
--- a/src/sbbs3/js_cryptcert.h
+++ b/src/sbbs3/js_cryptcert.h
@@ -7,6 +7,6 @@ struct js_cryptcert_private_data {
extern JSClass js_cryptcert_class;
-JSObject* DLLCALL js_CreateCryptCertObject(JSContext* cx, CRYPT_CERTIFICATE cert);
+JSObject* js_CreateCryptCertObject(JSContext* cx, CRYPT_CERTIFICATE cert);
#endif
diff --git a/src/sbbs3/js_cryptcon.h b/src/sbbs3/js_cryptcon.h
index c9331176b7..25e4ae680f 100644
--- a/src/sbbs3/js_cryptcon.h
+++ b/src/sbbs3/js_cryptcon.h
@@ -7,6 +7,6 @@ struct js_cryptcon_private_data {
extern JSClass js_cryptcon_class;
-JSObject* DLLCALL js_CreateCryptconObject(JSContext* cx, CRYPT_CONTEXT ctx);
+JSObject* js_CreateCryptconObject(JSContext* cx, CRYPT_CONTEXT ctx);
#endif
diff --git a/src/sbbs3/ringbuf.c b/src/sbbs3/ringbuf.c
index bb1a13cc18..1807676f3f 100644
--- a/src/sbbs3/ringbuf.c
+++ b/src/sbbs3/ringbuf.c
@@ -77,7 +77,7 @@
/****************************************************************************/
/* Returns 0 on success, non-zero on failure */
/****************************************************************************/
-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 *)
@@ -108,7 +108,7 @@ int RINGBUFCALL RingBufInit( RingBuf* rb, DWORD size
return(0);
}
-void RINGBUFCALL RingBufDispose( RingBuf* rb)
+void RingBufDispose( RingBuf* rb)
{
if(rb->pStart!=NULL)
os_free(rb->pStart);
@@ -137,7 +137,7 @@ void RINGBUFCALL RingBufDispose( RingBuf* rb)
#define RINGBUF_FILL_LEVEL(rb) (rb->pHead >= rb->pTail ? (rb->pHead - rb->pTail) \
: (rb->size - (rb->pTail - (rb->pHead + 1))))
-DWORD RINGBUFCALL RingBufFull( RingBuf* rb )
+DWORD RingBufFull( RingBuf* rb )
{
DWORD retval;
@@ -154,7 +154,7 @@ DWORD RINGBUFCALL RingBufFull( RingBuf* rb )
return(retval);
}
-DWORD RINGBUFCALL RingBufFree( RingBuf* rb )
+DWORD RingBufFree( RingBuf* rb )
{
DWORD retval;
@@ -163,7 +163,7 @@ DWORD RINGBUFCALL RingBufFree( RingBuf* rb )
return(retval);
}
-DWORD RINGBUFCALL RingBufWrite( RingBuf* rb, const BYTE* src, DWORD cnt )
+DWORD RingBufWrite( RingBuf* rb, const BYTE* src, DWORD cnt )
{
DWORD max, first, remain, fill_level;
@@ -224,7 +224,7 @@ DWORD RINGBUFCALL RingBufWrite( RingBuf* rb, const BYTE* src, DWORD cnt )
}
/* Pass NULL dst to just foward pointer (after Peek) */
-DWORD RINGBUFCALL RingBufRead( RingBuf* rb, BYTE* dst, DWORD cnt )
+DWORD RingBufRead( RingBuf* rb, BYTE* dst, DWORD cnt )
{
DWORD max, first, remain, len;
@@ -284,7 +284,7 @@ DWORD RINGBUFCALL RingBufRead( RingBuf* rb, BYTE* dst, DWORD cnt )
return(cnt);
}
-DWORD RINGBUFCALL RingBufPeek( RingBuf* rb, BYTE* dst, DWORD cnt)
+DWORD RingBufPeek( RingBuf* rb, BYTE* dst, DWORD cnt)
{
DWORD max, first, remain, len;
@@ -325,7 +325,7 @@ DWORD RINGBUFCALL RingBufPeek( RingBuf* rb, BYTE* dst, DWORD cnt)
}
/* Reset head and tail pointers */
-void RINGBUFCALL RingBufReInit(RingBuf* rb)
+void RingBufReInit(RingBuf* rb)
{
#ifdef RINGBUF_MUTEX
pthread_mutex_lock(&rb->mutex);
diff --git a/src/sbbs3/websrvr.h b/src/sbbs3/websrvr.h
index 3127c9fd29..70dd1861ac 100644
--- a/src/sbbs3/websrvr.h
+++ b/src/sbbs3/websrvr.h
@@ -151,9 +151,6 @@ static ini_bitdesc_t web_options[] = {
#ifdef DLLEXPORT
#undef DLLEXPORT
#endif
-#ifdef DLLCALL
-#undef DLLCALL
-#endif
#ifdef _WIN32
#ifdef WEBSRVR_EXPORTS
@@ -161,22 +158,16 @@ static ini_bitdesc_t web_options[] = {
#else
#define DLLEXPORT __declspec(dllimport)
#endif
- #ifdef __BORLANDC__
- #define DLLCALL
- #else
- #define DLLCALL
- #endif
#else
#define DLLEXPORT
- #define DLLCALL
#endif
#ifdef __cplusplus
extern "C" {
#endif
-DLLEXPORT void DLLCALL web_server(void* arg);
-DLLEXPORT void DLLCALL web_terminate(void);
-DLLEXPORT const char* DLLCALL web_ver(void);
+DLLEXPORT void web_server(void* arg);
+DLLEXPORT void web_terminate(void);
+DLLEXPORT const char* web_ver(void);
#ifdef __cplusplus
}
#endif
diff --git a/src/uifc/uifc.h b/src/uifc/uifc.h
index 8a8d537e7e..40312ca5dc 100644
--- a/src/uifc/uifc.h
+++ b/src/uifc/uifc.h
@@ -52,11 +52,6 @@
#endif
#ifdef _WIN32
- #ifdef __BORLANDC__
- #define UIFCCALL
- #else
- #define UIFCCALL
- #endif
#if defined(UIFC_IMPORTS) || defined(UIFC_EXPORTS)
#if defined(UIFC_IMPORTS)
#define UIFCEXPORT __declspec( dllimport )
@@ -70,7 +65,6 @@
#define UIFCEXPORTVAR extern
#endif
#else
- #define UIFCCALL
#define UIFCEXPORT
#define UIFCEXPORTVAR extern
#endif
@@ -530,8 +524,8 @@ UIFCEXPORTVAR char* uifcYesNoOpts[];
/* Returns 0 on success, non-zero on failure. */
/****************************************************************************/
int uifcini(uifcapi_t*); /* Original implementation based on conio */
-UIFCEXPORT int UIFCCALL uifcinix(uifcapi_t*); /* Standard I/O implementation */
-UIFCEXPORT int UIFCCALL uifcini32(uifcapi_t*); /* modern implementation */
+UIFCEXPORT int uifcinix(uifcapi_t*); /* Standard I/O implementation */
+UIFCEXPORT int uifcini32(uifcapi_t*); /* modern implementation */
/****************************************************************************/
#ifdef __cplusplus
diff --git a/src/uifc/uifc32.c b/src/uifc/uifc32.c
index 54a38d9acb..2b003e3af4 100644
--- a/src/uifc/uifc32.c
+++ b/src/uifc/uifc32.c
@@ -207,7 +207,7 @@ int inkey(void)
return(c);
}
-int UIFCCALL uifcini32(uifcapi_t* uifcapi)
+int uifcini32(uifcapi_t* uifcapi)
{
unsigned i;
struct text_info txtinfo;
diff --git a/src/uifc/uifcx.c b/src/uifc/uifcx.c
index ef1d8848d0..fda34ebd6f 100644
--- a/src/uifc/uifcx.c
+++ b/src/uifc/uifcx.c
@@ -86,7 +86,7 @@ static int uprintf(int x, int y, unsigned attr, char *fmat, ...)
/* Initialization function, see uifc.h for details. */
/* Returns 0 on success. */
/****************************************************************************/
-int UIFCCALL uifcinix(uifcapi_t* uifcapi)
+int uifcinix(uifcapi_t* uifcapi)
{
static char* yesNoOpts[] = {"Yes", "No", NULL};
diff --git a/src/xpdev/datewrap.h b/src/xpdev/datewrap.h
index 45d733569b..c57cd9447f 100644
--- a/src/xpdev/datewrap.h
+++ b/src/xpdev/datewrap.h
@@ -1,9 +1,5 @@
-/* datewrap.h */
-
/* Wrappers for non-standard date and time functions */
-/* $Id: datewrap.h,v 1.28 2019/07/24 04:08:25 rswindell Exp $ */
-
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
@@ -17,21 +13,9 @@
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
- * Anonymous FTP access to the most recent released source is available at *
- * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
- * *
- * Anonymous CVS access to the development source and modification history *
- * is available at cvs.synchro.net:/cvsroot/sbbs, example: *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
- * (just hit return, no password is necessary) *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
- * *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
- * You are encouraged to submit any modifications (preferably in Unix diff *
- * format) via e-mail to mods@synchro.net *
- * *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
@@ -45,16 +29,16 @@ extern "C" {
#endif
/* Return difference (in seconds) in time() result from standard (0 on success) */
-DLLEXPORT time_t DLLCALL checktime(void);
+DLLEXPORT time_t checktime(void);
/* Implementation of mktime()/timegm() that handles common tm element conversions for you */
-DLLEXPORT time_t DLLCALL sane_mktime(struct tm*);
-DLLEXPORT time_t DLLCALL sane_timegm(struct tm*);
+DLLEXPORT time_t sane_mktime(struct tm*);
+DLLEXPORT time_t sane_timegm(struct tm*);
/* Legacy (32-bit time_t) versions of time() and mktime() */
-DLLEXPORT time32_t DLLCALL time32(time32_t* tp);
-DLLEXPORT time32_t DLLCALL mktime32(struct tm*);
-DLLEXPORT struct tm* DLLCALL localtime32(const time32_t* t, struct tm* tm);
+DLLEXPORT time32_t time32(time32_t* tp);
+DLLEXPORT time32_t mktime32(struct tm*);
+DLLEXPORT struct tm* localtime32(const time32_t* t, struct tm* tm);
/*********************************************************************************/
/* Win32 implementations of recursive (thread-safe) std C time functions on Unix */
@@ -64,10 +48,10 @@ DLLEXPORT struct tm* DLLCALL localtime32(const time32_t* t, struct tm* tm);
#include <time.h> /* time_t, etc. */
- DLLEXPORT struct tm* DLLCALL gmtime_r(const time_t* t, struct tm* tm);
- DLLEXPORT struct tm* DLLCALL localtime_r(const time_t* t, struct tm* tm);
- DLLEXPORT char* DLLCALL ctime_r(const time_t *t, char *buf);
- DLLEXPORT char* DLLCALL asctime_r(const struct tm *tm, char *buf);
+ DLLEXPORT struct tm* gmtime_r(const time_t* t, struct tm* tm);
+ DLLEXPORT struct tm* localtime_r(const time_t* t, struct tm* tm);
+ DLLEXPORT char* ctime_r(const time_t *t, char *buf);
+ DLLEXPORT char* asctime_r(const struct tm *tm, char *buf);
#endif
@@ -103,8 +87,8 @@ struct time {
};
#define getdate(x) xp_getdate(x)
-DLLEXPORT void DLLCALL xp_getdate(struct date*);
-DLLEXPORT void DLLCALL gettime(struct time*);
+DLLEXPORT void xp_getdate(struct date*);
+DLLEXPORT void gettime(struct time*);
#endif /* !Borland */
diff --git a/src/xpdev/dirwrap.h b/src/xpdev/dirwrap.h
index 8c4ba2381b..dce4345f21 100644
--- a/src/xpdev/dirwrap.h
+++ b/src/xpdev/dirwrap.h
@@ -33,7 +33,7 @@
#endif
#include "gen_defs.h" /* ulong */
-#include "wrapdll.h" /* DLLEXPORT and DLLCALL */
+#include "wrapdll.h" /* DLLEXPORT */
#if defined(__cplusplus)
extern "C" {
@@ -105,8 +105,8 @@ extern "C" {
#define GLOB_NOMATCH 3 /* No matches found. */
#define GLOB_NOSYS 4 /* Not implemented. */
- DLLEXPORT int DLLCALL glob(const char *pattern, int flags, void* unused, glob_t*);
- DLLEXPORT void DLLCALL globfree(glob_t*);
+ DLLEXPORT int glob(const char *pattern, int flags, void* unused, glob_t*);
+ DLLEXPORT void globfree(glob_t*);
#endif
@@ -140,10 +140,10 @@ extern "C" {
/* Prototypes.
*/
- DLLEXPORT DIR* DLLCALL opendir (const char *__dirname);
- DLLEXPORT struct dirent* DLLCALL readdir (DIR *__dir);
- DLLEXPORT int DLLCALL closedir (DIR *__dir);
- DLLEXPORT void DLLCALL rewinddir(DIR *__dir);
+ DLLEXPORT DIR* opendir (const char *__dirname);
+ DLLEXPORT struct dirent* readdir (DIR *__dir);
+ DLLEXPORT int closedir (DIR *__dir);
+ DLLEXPORT void rewinddir(DIR *__dir);
#elif !defined(__WATCOMC__)
#include <dirent.h> /* POSIX directory functions */
#endif
@@ -200,37 +200,37 @@ extern "C" {
#endif
/* General file system wrappers for all platforms and compilers */
-DLLEXPORT BOOL DLLCALL fexist(const char *filespec);
-DLLEXPORT BOOL DLLCALL fexistcase(char *filespec); /* fixes upr/lwr case fname */
-DLLEXPORT off_t DLLCALL flength(const char *filename);
-DLLEXPORT time_t DLLCALL fdate(const char *filename);
-DLLEXPORT time_t DLLCALL fcdate(const char* filename);
-DLLEXPORT int DLLCALL setfdate(const char* filename, time_t t);
-DLLEXPORT BOOL DLLCALL isdir(const char *filename);
-DLLEXPORT BOOL DLLCALL isabspath(const char *filename);
-DLLEXPORT BOOL DLLCALL isfullpath(const char* filename);
-DLLEXPORT char* DLLCALL getfname(const char* path);
-DLLEXPORT char* DLLCALL getfext(const char* path);
-DLLEXPORT int DLLCALL getfattr(const char* filename);
-DLLEXPORT int DLLCALL getfmode(const char* filename);
-DLLEXPORT ulong DLLCALL getfilecount(const char *path);
-DLLEXPORT char* DLLCALL getdirname(const char* path);
-DLLEXPORT long DLLCALL getdirsize(const char* path, BOOL include_subdirs, BOOL subdir_only);
-DLLEXPORT ulong DLLCALL getdisksize(const char* path, ulong unit);
-DLLEXPORT ulong DLLCALL getfreediskspace(const char* path, ulong unit);
-DLLEXPORT uint64_t DLLCALL getfilesizetotal(const char *path);
-DLLEXPORT long DLLCALL delfiles(const char *inpath, const char *spec, size_t keep);
-DLLEXPORT char* DLLCALL backslash(char* path);
-DLLEXPORT BOOL DLLCALL wildmatch(const char *fname, const char *spec, BOOL path, BOOL case_sensitive);
-DLLEXPORT BOOL DLLCALL wildmatchi(const char *fname, const char *spec, BOOL path);
-DLLEXPORT int DLLCALL mkpath(const char* path);
+DLLEXPORT BOOL fexist(const char *filespec);
+DLLEXPORT BOOL fexistcase(char *filespec); /* fixes upr/lwr case fname */
+DLLEXPORT off_t flength(const char *filename);
+DLLEXPORT time_t fdate(const char *filename);
+DLLEXPORT time_t fcdate(const char* filename);
+DLLEXPORT int setfdate(const char* filename, time_t t);
+DLLEXPORT BOOL isdir(const char *filename);
+DLLEXPORT BOOL isabspath(const char *filename);
+DLLEXPORT BOOL isfullpath(const char* filename);
+DLLEXPORT char* getfname(const char* path);
+DLLEXPORT char* getfext(const char* path);
+DLLEXPORT int getfattr(const char* filename);
+DLLEXPORT int getfmode(const char* filename);
+DLLEXPORT ulong getfilecount(const char *path);
+DLLEXPORT char* getdirname(const char* path);
+DLLEXPORT long getdirsize(const char* path, BOOL include_subdirs, BOOL subdir_only);
+DLLEXPORT ulong getdisksize(const char* path, ulong unit);
+DLLEXPORT ulong getfreediskspace(const char* path, ulong unit);
+DLLEXPORT uint64_t getfilesizetotal(const char *path);
+DLLEXPORT long delfiles(const char *inpath, const char *spec, size_t keep);
+DLLEXPORT char* backslash(char* path);
+DLLEXPORT BOOL wildmatch(const char *fname, const char *spec, BOOL path, BOOL case_sensitive);
+DLLEXPORT BOOL wildmatchi(const char *fname, const char *spec, BOOL path);
+DLLEXPORT int mkpath(const char* path);
#if defined(__unix__)
-DLLEXPORT void DLLCALL _splitpath(const char *path, char *drive, char *dir,
+DLLEXPORT void _splitpath(const char *path, char *drive, char *dir,
char *fname, char *ext);
-DLLEXPORT char * DLLCALL _fullpath(char *target, const char *path, size_t size);
-DLLEXPORT int DLLCALL removecase(const char *path);
+DLLEXPORT char * _fullpath(char *target, const char *path, size_t size);
+DLLEXPORT int removecase(const char *path);
#else
#define removecase(x) remove(x)
#endif
diff --git a/src/xpdev/eventwrap.h b/src/xpdev/eventwrap.h
index 606923c490..e98b666d19 100644
--- a/src/xpdev/eventwrap.h
+++ b/src/xpdev/eventwrap.h
@@ -1,9 +1,5 @@
-/* eventwrap.h */
-
/* Event-related cross-platform development wrappers (Win32 API emulation) */
-/* $Id: eventwrap.h,v 1.4 2018/07/24 01:13:09 rswindell Exp $ */
-
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
@@ -17,21 +13,9 @@
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
- * Anonymous FTP access to the most recent released source is available at *
- * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
- * *
- * Anonymous CVS access to the development source and modification history *
- * is available at cvs.synchro.net:/cvsroot/sbbs, example: *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
- * (just hit return, no password is necessary) *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
- * *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
- * You are encouraged to submit any modifications (preferably in Unix diff *
- * format) via e-mail to mods@synchro.net *
- * *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
diff --git a/src/xpdev/filewrap.h b/src/xpdev/filewrap.h
index a5cb56b1f0..ff0e1a565c 100644
--- a/src/xpdev/filewrap.h
+++ b/src/xpdev/filewrap.h
@@ -1,9 +1,5 @@
-/* filewrap.h */
-
/* File system-call wrappers */
-/* $Id: filewrap.h,v 1.39 2019/08/31 22:16:21 rswindell Exp $ */
-
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
@@ -17,21 +13,9 @@
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
- * Anonymous FTP access to the most recent released source is available at *
- * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
- * *
- * Anonymous CVS access to the development source and modification history *
- * is available at cvs.synchro.net:/cvsroot/sbbs, example: *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
- * (just hit return, no password is necessary) *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
- * *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
- * You are encouraged to submit any modifications (preferably in Unix diff *
- * format) via e-mail to mods@synchro.net *
- * *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
diff --git a/src/xpdev/genwrap.h b/src/xpdev/genwrap.h
index 1b643f7d07..e888aa02fa 100644
--- a/src/xpdev/genwrap.h
+++ b/src/xpdev/genwrap.h
@@ -1,8 +1,5 @@
/* General cross-platform development wrappers */
-/* $Id: genwrap.h,v 1.122 2020/08/08 23:25:46 rswindell Exp $ */
-// vi: tabstop=4
-
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
@@ -16,21 +13,9 @@
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
- * Anonymous FTP access to the most recent released source is available at *
- * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
- * *
- * Anonymous CVS access to the development source and modification history *
- * is available at cvs.synchro.net:/cvsroot/sbbs, example: *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
- * (just hit return, no password is necessary) *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
- * *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
- * You are encouraged to submit any modifications (preferably in Unix diff *
- * format) via e-mail to mods@synchro.net *
- * *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
@@ -41,7 +26,7 @@
#include <string.h> /* strerror() */
#include <time.h> /* clock_t */
#include "gen_defs.h" /* ulong */
-#include "wrapdll.h" /* DLLEXPORT and DLLCALL */
+#include "wrapdll.h" /* DLLEXPORT and */
#if defined(__unix__)
#include <sched.h> /* sched_yield */
@@ -242,13 +227,13 @@ extern "C" {
#endif
#if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(__WATCOMC__)
- DLLEXPORT char* DLLCALL ultoa(ulong, char*, int radix);
+ DLLEXPORT char* ultoa(ulong, char*, int radix);
#endif
#if defined(__unix__)
- DLLEXPORT char* DLLCALL strupr(char* str);
- DLLEXPORT char* DLLCALL strlwr(char* str);
- DLLEXPORT char* DLLCALL strrev(char* str);
+ DLLEXPORT char* strupr(char* str);
+ DLLEXPORT char* strlwr(char* str);
+ DLLEXPORT char* strrev(char* str);
#if !defined(stricmp)
#define stricmp strcasecmp
#define strnicmp strncasecmp
@@ -260,28 +245,28 @@ extern "C" {
#endif
#if defined(_WIN32)
- DLLEXPORT char* DLLCALL strcasestr(const char* haystack, const char* needle);
+ DLLEXPORT char* strcasestr(const char* haystack, const char* needle);
#endif
/* Skip white-space chars at beginning of string */
-DLLEXPORT char* DLLCALL skipsp(char* str);
+DLLEXPORT char* skipsp(char* str);
/* Truncate white-space chars off end of string */
-DLLEXPORT char* DLLCALL truncsp(char* str);
+DLLEXPORT char* truncsp(char* str);
/* Truncate white-space chars off end of every \n-terminated line in string */
-DLLEXPORT char* DLLCALL truncsp_lines(char* str);
+DLLEXPORT char* truncsp_lines(char* str);
/* Truncate new-line chars off end of string */
-DLLEXPORT char* DLLCALL truncnl(char* str);
+DLLEXPORT char* truncnl(char* str);
#define STRERROR(x) strerror(x)
/* Re-entrant version of strerror() */
-DLLEXPORT char* DLLCALL safe_strerror(int errnum, char* buf, size_t buflen);
+DLLEXPORT char* safe_strerror(int errnum, char* buf, size_t buflen);
/*********************/
/* Utility Functions */
/*********************/
/* Thunking for multi-threaded specific implementations of "errno" */
-DLLEXPORT int DLLCALL get_errno(void);
+DLLEXPORT int get_errno(void);
/**********************************/
/* Common Utility Macro Functions */
@@ -362,37 +347,37 @@ DLLEXPORT int DLLCALL get_errno(void);
/* Win32 implementations of recursive (thread-safe) std C time functions on Unix */
#if !defined(__unix__)
- DLLEXPORT char* DLLCALL strtok_r(char *str, const char *delim, char **last);
+ DLLEXPORT char* strtok_r(char *str, const char *delim, char **last);
#endif
/* Mimic the Borland randomize() and random() CRTL functions */
-DLLEXPORT void DLLCALL xp_randomize(void);
-DLLEXPORT long DLLCALL xp_random(int);
-
-DLLEXPORT long double DLLCALL xp_timer(void);
-DLLEXPORT char* DLLCALL os_version(char *str);
-DLLEXPORT char* DLLCALL os_cmdshell(void);
-DLLEXPORT char* DLLCALL lastchar(const char* str);
-DLLEXPORT int DLLCALL safe_snprintf(char *dst, size_t size, const char *fmt, ...)
+DLLEXPORT void xp_randomize(void);
+DLLEXPORT long xp_random(int);
+
+DLLEXPORT long double xp_timer(void);
+DLLEXPORT char* os_version(char *str);
+DLLEXPORT char* os_cmdshell(void);
+DLLEXPORT char* lastchar(const char* str);
+DLLEXPORT int safe_snprintf(char *dst, size_t size, const char *fmt, ...)
#if defined(__GNUC__) // Catch printf-format errors
__attribute__ ((format (printf, 3 , 4))); // 1 is 'this'
#endif
;
/* C string/char escape-sequence processing */
-DLLEXPORT char* DLLCALL c_escape_str(const char* src, char* dst, size_t maxlen, BOOL ctrl_only);
-DLLEXPORT char* DLLCALL c_escape_char(char ch);
-DLLEXPORT char* DLLCALL c_unescape_str(char* str);
-DLLEXPORT char DLLCALL c_unescape_char_ptr(const char* str, char** endptr);
-DLLEXPORT char DLLCALL c_unescape_char(char ch);
+DLLEXPORT char* c_escape_str(const char* src, char* dst, size_t maxlen, BOOL ctrl_only);
+DLLEXPORT char* c_escape_char(char ch);
+DLLEXPORT char* c_unescape_str(char* str);
+DLLEXPORT char c_unescape_char_ptr(const char* str, char** endptr);
+DLLEXPORT char c_unescape_char(char ch);
/* Power-of-2 byte count string parser (e.g. "100K" returns 102400 if unit is 1) */
-DLLEXPORT int64_t DLLCALL parse_byte_count(const char*, ulong unit);
-DLLEXPORT double DLLCALL parse_duration(const char*);
-DLLEXPORT char* DLLCALL duration_to_str(double value, char* str, size_t size);
-DLLEXPORT char* DLLCALL duration_to_vstr(double value, char* str, size_t size);
-DLLEXPORT char* DLLCALL byte_count_to_str(int64_t bytes, char* str, size_t size);
-DLLEXPORT char* DLLCALL byte_estimate_to_str(int64_t bytes, char* str, size_t size, ulong unit, int precision);
+DLLEXPORT int64_t parse_byte_count(const char*, ulong unit);
+DLLEXPORT double parse_duration(const char*);
+DLLEXPORT char* duration_to_str(double value, char* str, size_t size);
+DLLEXPORT char* duration_to_vstr(double value, char* str, size_t size);
+DLLEXPORT char* byte_count_to_str(int64_t bytes, char* str, size_t size);
+DLLEXPORT char* byte_estimate_to_str(int64_t bytes, char* str, size_t size, ulong unit, int precision);
/* Microsoft (e.g. DOS/Win32) real-time system clock API (ticks since process started) */
typedef clock_t msclock_t;
@@ -404,8 +389,8 @@ typedef clock_t msclock_t;
msclock_t msclock(void);
#endif
-DLLEXPORT BOOL DLLCALL check_pid(pid_t);
-DLLEXPORT BOOL DLLCALL terminate_pid(pid_t);
+DLLEXPORT BOOL check_pid(pid_t);
+DLLEXPORT BOOL terminate_pid(pid_t);
#if defined(__cplusplus)
}
diff --git a/src/xpdev/link_list.h b/src/xpdev/link_list.h
index 1360ed3d3e..6dd8d550eb 100644
--- a/src/xpdev/link_list.h
+++ b/src/xpdev/link_list.h
@@ -79,98 +79,98 @@ typedef struct link_list {
} link_list_t;
/* Initialization, Allocation, and Freeing of Lists and Nodes */
-DLLEXPORT link_list_t* DLLCALL listInit(link_list_t* /* NULL to auto-allocate */, long flags);
-DLLEXPORT BOOL DLLCALL listFree(link_list_t*);
-DLLEXPORT long DLLCALL listFreeNodes(link_list_t*);
-DLLEXPORT BOOL DLLCALL listFreeNodeData(list_node_t* node);
+DLLEXPORT link_list_t* listInit(link_list_t* /* NULL to auto-allocate */, long flags);
+DLLEXPORT BOOL listFree(link_list_t*);
+DLLEXPORT long listFreeNodes(link_list_t*);
+DLLEXPORT BOOL listFreeNodeData(list_node_t* node);
/* Increment/decrement reference counter (and auto-free when zero), returns -1 on error */
-DLLEXPORT long DLLCALL listAttach(link_list_t*);
-DLLEXPORT long DLLCALL listDetach(link_list_t*);
+DLLEXPORT long listAttach(link_list_t*);
+DLLEXPORT long listDetach(link_list_t*);
#if defined(LINK_LIST_THREADSAFE)
-DLLEXPORT BOOL DLLCALL listSemPost(link_list_t*);
-DLLEXPORT BOOL DLLCALL listSemWait(link_list_t*);
-DLLEXPORT BOOL DLLCALL listSemTryWait(link_list_t*);
-DLLEXPORT BOOL DLLCALL listSemTryWaitBlock(link_list_t*, unsigned long timeout);
+DLLEXPORT BOOL listSemPost(link_list_t*);
+DLLEXPORT BOOL listSemWait(link_list_t*);
+DLLEXPORT BOOL listSemTryWait(link_list_t*);
+DLLEXPORT BOOL listSemTryWaitBlock(link_list_t*, unsigned long timeout);
#endif
/* Lock/unlock linked lists (works best for mutex-protected lists) */
/* Locks are recursive (e.g. must call Unlock for each call to Lock */
-DLLEXPORT BOOL DLLCALL listLock(link_list_t*);
-DLLEXPORT BOOL DLLCALL listUnlock(link_list_t*);
-DLLEXPORT BOOL DLLCALL listIsLocked(const link_list_t*);
+DLLEXPORT BOOL listLock(link_list_t*);
+DLLEXPORT BOOL listUnlock(link_list_t*);
+DLLEXPORT BOOL listIsLocked(const link_list_t*);
#define listForceUnlock(list) while(listUnlock(list)==TRUE)
/* Return count or index of nodes, or -1 on error */
-DLLEXPORT long DLLCALL listCountNodes(link_list_t*);
-DLLEXPORT long DLLCALL listNodeIndex(link_list_t*, list_node_t*);
+DLLEXPORT long listCountNodes(link_list_t*);
+DLLEXPORT long listNodeIndex(link_list_t*, list_node_t*);
/* Get/Set list private data */
-DLLEXPORT void* DLLCALL listSetPrivateData(link_list_t*, void*);
-DLLEXPORT void* DLLCALL listGetPrivateData(link_list_t*);
+DLLEXPORT void* listSetPrivateData(link_list_t*, void*);
+DLLEXPORT void* listGetPrivateData(link_list_t*);
/* Return an allocated string list (which must be freed), array of all strings in linked list */
-DLLEXPORT str_list_t DLLCALL listStringList(link_list_t*);
+DLLEXPORT str_list_t listStringList(link_list_t*);
/* Return an allocated string list (which must be freed), subset of strings in linked list */
-DLLEXPORT str_list_t DLLCALL listSubStringList(const list_node_t*, long max);
+DLLEXPORT str_list_t listSubStringList(const list_node_t*, long max);
/* Free a string list returned from either of the above functions */
-DLLEXPORT void* DLLCALL listFreeStringList(str_list_t);
+DLLEXPORT void* listFreeStringList(str_list_t);
/* Extract subset (up to max number of nodes) in linked list (src_node) and place into dest_list */
/* dest_list == NULL, then allocate a return a new linked list */
-DLLEXPORT link_list_t* DLLCALL listExtract(link_list_t* dest_list, const list_node_t* src_node, long max);
+DLLEXPORT link_list_t* listExtract(link_list_t* dest_list, const list_node_t* src_node, long max);
/* Simple search functions returning found node or NULL on error */
-DLLEXPORT list_node_t* DLLCALL listNodeAt(link_list_t*, long index);
+DLLEXPORT list_node_t* listNodeAt(link_list_t*, long index);
/* Find a specific node by data or tag */
/* Pass length of 0 to search by data pointer rather than by data content comparison (memcmp) */
-DLLEXPORT list_node_t* DLLCALL listFindNode(link_list_t*, const void* data, size_t length);
+DLLEXPORT list_node_t* listFindNode(link_list_t*, const void* data, size_t length);
/* Find a specific node by its tag value */
#define listFindTaggedNode(list, tag) listFindNode(list, NULL, tag)
/* Pass length of 0 to search by data pointer rather than by data content comparison (memcmp) */
-DLLEXPORT ulong DLLCALL listCountMatches(link_list_t*, const void* data, size_t length);
+DLLEXPORT ulong listCountMatches(link_list_t*, const void* data, size_t length);
/* Convenience functions */
-DLLEXPORT list_node_t* DLLCALL listFirstNode(link_list_t*);
-DLLEXPORT list_node_t* DLLCALL listLastNode(link_list_t*);
-DLLEXPORT list_node_t* DLLCALL listNextNode(const list_node_t*);
-DLLEXPORT list_node_t* DLLCALL listPrevNode(const list_node_t*);
-DLLEXPORT void* DLLCALL listNodeData(const list_node_t*);
+DLLEXPORT list_node_t* listFirstNode(link_list_t*);
+DLLEXPORT list_node_t* listLastNode(link_list_t*);
+DLLEXPORT list_node_t* listNextNode(const list_node_t*);
+DLLEXPORT list_node_t* listPrevNode(const list_node_t*);
+DLLEXPORT void* listNodeData(const list_node_t*);
/* Primitive node locking (not recursive) */
-DLLEXPORT BOOL DLLCALL listLockNode(list_node_t*);
-DLLEXPORT BOOL DLLCALL listUnlockNode(list_node_t*);
-DLLEXPORT BOOL DLLCALL listNodeIsLocked(const list_node_t*);
+DLLEXPORT BOOL listLockNode(list_node_t*);
+DLLEXPORT BOOL listUnlockNode(list_node_t*);
+DLLEXPORT BOOL listNodeIsLocked(const list_node_t*);
/* Add node to list, returns pointer to new node or NULL on error */
-DLLEXPORT list_node_t* DLLCALL listAddNode(link_list_t*, void* data, list_node_tag_t, list_node_t* after /* NULL=insert */);
+DLLEXPORT list_node_t* listAddNode(link_list_t*, void* data, list_node_tag_t, list_node_t* after /* NULL=insert */);
/* Add array of node data to list, returns number of nodes added (or negative on error) */
/* tag array may be NULL */
-DLLEXPORT long DLLCALL listAddNodes(link_list_t*, void** data, list_node_tag_t*, list_node_t* after /* NULL=insert */);
+DLLEXPORT long listAddNodes(link_list_t*, void** data, list_node_tag_t*, list_node_t* after /* NULL=insert */);
/* Add node to list, allocating and copying the data for the node */
-DLLEXPORT list_node_t* DLLCALL listAddNodeData(link_list_t*, const void* data, size_t length, list_node_tag_t, list_node_t* after);
+DLLEXPORT list_node_t* listAddNodeData(link_list_t*, const void* data, size_t length, list_node_tag_t, list_node_t* after);
/* Add node to list, allocating and copying ASCIIZ string data */
-DLLEXPORT list_node_t* DLLCALL listAddNodeString(link_list_t*, const char* str, list_node_tag_t, list_node_t* after);
+DLLEXPORT list_node_t* listAddNodeString(link_list_t*, const char* str, list_node_tag_t, list_node_t* after);
/* Add a list of strings to the linked list, allocating and copying each */
/* tag array may be NULL */
-DLLEXPORT long DLLCALL listAddStringList(link_list_t*, str_list_t, list_node_tag_t*, list_node_t* after);
+DLLEXPORT long listAddStringList(link_list_t*, str_list_t, list_node_tag_t*, list_node_t* after);
/* Add a list of nodes from a source linked list */
-DLLEXPORT long DLLCALL listAddNodeList(link_list_t*, const link_list_t* src, list_node_t* after);
+DLLEXPORT long listAddNodeList(link_list_t*, const link_list_t* src, list_node_t* after);
/* Merge a source linked list into the destination linked list */
/* after merging, the nodes in the source linked list should not be modified or freed */
-DLLEXPORT long DLLCALL listMerge(link_list_t* dest, const link_list_t* src, list_node_t* after);
+DLLEXPORT long listMerge(link_list_t* dest, const link_list_t* src, list_node_t* after);
/* Swap the data pointers and flags for 2 nodes (possibly in separate lists) */
-DLLEXPORT BOOL DLLCALL listSwapNodes(list_node_t* node1, list_node_t* node2);
+DLLEXPORT BOOL listSwapNodes(list_node_t* node1, list_node_t* node2);
/* Convenience macros for pushing, popping, and inserting nodes */
#define listPushNode(list, data) listAddNode(list, data, LIST_NODE_TAG_DEFAULT, LAST_NODE)
@@ -185,17 +185,17 @@ DLLEXPORT BOOL DLLCALL listSwapNodes(list_node_t* node1, list_node_t* node2);
#define listShiftNode(list) listRemoveNode(list, FIRST_NODE, FALSE)
/* Remove node from list, returning the node's data (if not free'd) */
-DLLEXPORT void* DLLCALL listRemoveNode(link_list_t*, list_node_t* /* NULL=first */, BOOL free_data);
-DLLEXPORT void* DLLCALL listRemoveTaggedNode(link_list_t*, list_node_tag_t, BOOL free_data);
+DLLEXPORT void* listRemoveNode(link_list_t*, list_node_t* /* NULL=first */, BOOL free_data);
+DLLEXPORT void* listRemoveTaggedNode(link_list_t*, list_node_tag_t, BOOL free_data);
/* Remove multiple nodes from list, returning the number of nodes removed */
-DLLEXPORT long DLLCALL listRemoveNodes(link_list_t*, list_node_t* /* NULL=first */, long count, BOOL free_data);
+DLLEXPORT long listRemoveNodes(link_list_t*, list_node_t* /* NULL=first */, long count, BOOL free_data);
/* Reverse the nodes in a list */
-DLLEXPORT void DLLCALL listReverse(link_list_t*);
+DLLEXPORT void listReverse(link_list_t*);
/* Return >= 0 (count of nodes) if list is valid, negative otherwise */
-DLLEXPORT long DLLCALL listVerify(link_list_t*);
+DLLEXPORT long listVerify(link_list_t*);
#if defined(__cplusplus)
}
diff --git a/src/xpdev/msg_queue.h b/src/xpdev/msg_queue.h
index 5448a419b8..5df9af8a80 100644
--- a/src/xpdev/msg_queue.h
+++ b/src/xpdev/msg_queue.h
@@ -1,9 +1,5 @@
-/* msg_queue.h */
-
/* Uni or Bi-directional FIFO message queue */
-/* $Id: msg_queue.h,v 1.9 2019/08/22 01:40:21 rswindell Exp $ */
-
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
@@ -17,21 +13,9 @@
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
- * Anonymous FTP access to the most recent released source is available at *
- * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
- * *
- * Anonymous CVS access to the development source and modification history *
- * is available at cvs.synchro.net:/cvsroot/sbbs, example: *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
- * (just hit return, no password is necessary) *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
- * *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
- * You are encouraged to submit any modifications (preferably in Unix diff *
- * format) via e-mail to mods@synchro.net *
- * *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
@@ -60,30 +44,30 @@ typedef struct {
#define MSG_QUEUE_BIDIR (1<<1) /* Bi-directional message queue */
#define MSG_QUEUE_ORPHAN (1<<2) /* Owner has detached */
-DLLEXPORT msg_queue_t* DLLCALL msgQueueInit(msg_queue_t*, long flags);
-DLLEXPORT BOOL DLLCALL msgQueueFree(msg_queue_t*);
+DLLEXPORT msg_queue_t* msgQueueInit(msg_queue_t*, long flags);
+DLLEXPORT BOOL msgQueueFree(msg_queue_t*);
-DLLEXPORT long DLLCALL msgQueueAttach(msg_queue_t*);
-DLLEXPORT long DLLCALL msgQueueDetach(msg_queue_t*);
-DLLEXPORT BOOL DLLCALL msgQueueOwner(msg_queue_t*);
+DLLEXPORT long msgQueueAttach(msg_queue_t*);
+DLLEXPORT long msgQueueDetach(msg_queue_t*);
+DLLEXPORT BOOL msgQueueOwner(msg_queue_t*);
/* Get/Set queue private data */
-DLLEXPORT void* DLLCALL msgQueueSetPrivateData(msg_queue_t*, void*);
-DLLEXPORT void* DLLCALL msgQueueGetPrivateData(msg_queue_t*);
+DLLEXPORT void* msgQueueSetPrivateData(msg_queue_t*, void*);
+DLLEXPORT void* msgQueueGetPrivateData(msg_queue_t*);
-DLLEXPORT BOOL DLLCALL msgQueueWait(msg_queue_t* q, long timeout);
-DLLEXPORT long DLLCALL msgQueueReadLevel(msg_queue_t*);
-DLLEXPORT void* DLLCALL msgQueueRead(msg_queue_t*, long timeout);
-DLLEXPORT void* DLLCALL msgQueuePeek(msg_queue_t*, long timeout);
-DLLEXPORT void* DLLCALL msgQueueFind(msg_queue_t*, const void*, size_t length);
-DLLEXPORT list_node_t* DLLCALL msgQueueFirstNode(msg_queue_t*);
-DLLEXPORT list_node_t* DLLCALL msgQueueLastNode(msg_queue_t*);
+DLLEXPORT BOOL msgQueueWait(msg_queue_t* q, long timeout);
+DLLEXPORT long msgQueueReadLevel(msg_queue_t*);
+DLLEXPORT void* msgQueueRead(msg_queue_t*, long timeout);
+DLLEXPORT void* msgQueuePeek(msg_queue_t*, long timeout);
+DLLEXPORT void* msgQueueFind(msg_queue_t*, const void*, size_t length);
+DLLEXPORT list_node_t* msgQueueFirstNode(msg_queue_t*);
+DLLEXPORT list_node_t* msgQueueLastNode(msg_queue_t*);
#define msgQueueNextNode(node) listNextNode(node)
#define msgQueuePrevNode(node) listPrevNode(node)
#define msgQueueNodeData(node) listNodeData(node)
-DLLEXPORT long DLLCALL msgQueueWriteLevel(msg_queue_t*);
-DLLEXPORT BOOL DLLCALL msgQueueWrite(msg_queue_t*, const void*, size_t length);
+DLLEXPORT long msgQueueWriteLevel(msg_queue_t*);
+DLLEXPORT BOOL msgQueueWrite(msg_queue_t*, const void*, size_t length);
#if defined(__cplusplus)
}
diff --git a/src/xpdev/multisock.h b/src/xpdev/multisock.h
index 413e79e9e9..c24a06117c 100644
--- a/src/xpdev/multisock.h
+++ b/src/xpdev/multisock.h
@@ -33,19 +33,19 @@ struct xpms_set {
extern "C" {
#endif
-DLLEXPORT struct xpms_set* DLLCALL xpms_create(unsigned int retries, unsigned int wait_secs,
+DLLEXPORT struct xpms_set* xpms_create(unsigned int retries, unsigned int wait_secs,
int (*lprintf)(int level, const char *fmt, ...));
-DLLEXPORT void DLLCALL xpms_destroy(struct xpms_set *xpms_set, void (*sock_destroy)(SOCKET, void *), void *cbdata);
-DLLEXPORT BOOL DLLCALL xpms_add(struct xpms_set *xpms_set, int domain, int type,
+DLLEXPORT void xpms_destroy(struct xpms_set *xpms_set, void (*sock_destroy)(SOCKET, void *), void *cbdata);
+DLLEXPORT BOOL xpms_add(struct xpms_set *xpms_set, int domain, int type,
int protocol, const char *addr, uint16_t port, const char *prot,
void (*sock_init)(SOCKET, void *), int(*bind_init)(BOOL), void *cbdata);
-DLLEXPORT BOOL DLLCALL xpms_add_list(struct xpms_set *xpms_set, int domain, int type,
+DLLEXPORT BOOL xpms_add_list(struct xpms_set *xpms_set, int domain, int type,
int protocol, str_list_t list, uint16_t default_port, const char *prot,
void (*sock_init)(SOCKET, void *), int(*bind_init)(BOOL), void *cbdata);
-DLLEXPORT BOOL DLLCALL xpms_add_chararray_list(struct xpms_set *xpms_set, int domain, int type,
+DLLEXPORT BOOL xpms_add_chararray_list(struct xpms_set *xpms_set, int domain, int type,
int protocol, const char *list, uint16_t default_port, const char *prot,
void (*sock_init)(SOCKET, void *), int(*bind_init)(BOOL), void *cbdata);
-DLLEXPORT SOCKET DLLCALL xpms_accept(struct xpms_set *, union xp_sockaddr * addr,
+DLLEXPORT SOCKET xpms_accept(struct xpms_set *, union xp_sockaddr * addr,
socklen_t * addrlen, unsigned int timeout, uint32_t flags, void **cb_data);
#ifdef __cplusplus
diff --git a/src/xpdev/netwrap.h b/src/xpdev/netwrap.h
index 393bdb98f4..d8fc18f88d 100644
--- a/src/xpdev/netwrap.h
+++ b/src/xpdev/netwrap.h
@@ -1,9 +1,5 @@
-/* netwrap.h */
-
/* Network related wrapper functions */
-/* $Id: netwrap.h,v 1.5 2018/07/24 01:13:09 rswindell Exp $ */
-
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
@@ -17,21 +13,9 @@
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
- * Anonymous FTP access to the most recent released source is available at *
- * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
- * *
- * Anonymous CVS access to the development source and modification history *
- * is available at cvs.synchro.net:/cvsroot/sbbs, example: *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
- * (just hit return, no password is necessary) *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
- * *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
- * You are encouraged to submit any modifications (preferably in Unix diff *
- * format) via e-mail to mods@synchro.net *
- * *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
@@ -48,9 +32,9 @@
extern "C" {
#endif
-DLLEXPORT const char* DLLCALL getHostNameByAddr(const char*);
-DLLEXPORT str_list_t DLLCALL getNameServerList(void);
-DLLEXPORT void DLLCALL freeNameServerList(str_list_t);
+DLLEXPORT const char* getHostNameByAddr(const char*);
+DLLEXPORT str_list_t getNameServerList(void);
+DLLEXPORT void freeNameServerList(str_list_t);
#if defined(__cplusplus)
}
diff --git a/src/xpdev/semfile.h b/src/xpdev/semfile.h
index f7a04a1e78..1b73d1b7d5 100644
--- a/src/xpdev/semfile.h
+++ b/src/xpdev/semfile.h
@@ -1,9 +1,5 @@
-/* semfile.h */
-
/* Semaphore file functions */
-/* $Id: semfile.h,v 1.2 2018/07/24 01:13:09 rswindell Exp $ */
-
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
@@ -17,21 +13,9 @@
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
- * Anonymous FTP access to the most recent released source is available at *
- * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
- * *
- * Anonymous CVS access to the development source and modification history *
- * is available at cvs.synchro.net:/cvsroot/sbbs, example: *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
- * (just hit return, no password is necessary) *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
- * *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
- * You are encouraged to submit any modifications (preferably in Unix diff *
- * format) via e-mail to mods@synchro.net *
- * *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
@@ -40,21 +24,21 @@
#include <time.h> /* time_t */
#include "str_list.h" /* string list functions and types */
-#include "wrapdll.h" /* DLLEXPORT and DLLCALL */
+#include "wrapdll.h" /* DLLEXPORT */
#if defined(__cplusplus)
extern "C" {
#endif
/* semfile.c */
-DLLEXPORT BOOL DLLCALL semfile_signal(const char* fname, const char* text);
-DLLEXPORT BOOL DLLCALL semfile_check(time_t* t, const char* fname);
-DLLEXPORT char* DLLCALL semfile_list_check(time_t* t, str_list_t filelist);
+DLLEXPORT BOOL semfile_signal(const char* fname, const char* text);
+DLLEXPORT BOOL semfile_check(time_t* t, const char* fname);
+DLLEXPORT char* semfile_list_check(time_t* t, str_list_t filelist);
DLLEXPORT str_list_t
- DLLCALL semfile_list_init(const char* parent, const char* action
+ semfile_list_init(const char* parent, const char* action
,const char* service);
-DLLEXPORT void DLLCALL semfile_list_add(str_list_t* filelist, const char* fname);
-DLLEXPORT void DLLCALL semfile_list_free(str_list_t* filelist);
+DLLEXPORT void semfile_list_add(str_list_t* filelist, const char* fname);
+DLLEXPORT void semfile_list_free(str_list_t* filelist);
#if defined(__cplusplus)
}
diff --git a/src/xpdev/semwrap.h b/src/xpdev/semwrap.h
index 9609801c8d..17cae498a6 100644
--- a/src/xpdev/semwrap.h
+++ b/src/xpdev/semwrap.h
@@ -1,9 +1,5 @@
-/* semwrap.h */
-
/* Semaphore-related cross-platform development wrappers */
-/* $Id: semwrap.h,v 1.16 2018/07/24 01:13:09 rswindell Exp $ */
-
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
@@ -17,21 +13,9 @@
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
- * Anonymous FTP access to the most recent released source is available at *
- * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
- * *
- * Anonymous CVS access to the development source and modification history *
- * is available at cvs.synchro.net:/cvsroot/sbbs, example: *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
- * (just hit return, no password is necessary) *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
- * *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
- * You are encouraged to submit any modifications (preferably in Unix diff *
- * format) via e-mail to mods@synchro.net *
- * *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
@@ -68,10 +52,10 @@ extern "C" {
/* POSIX semaphores */
typedef HANDLE sem_t;
- DLLEXPORT int DLLCALL sem_init(sem_t*, int pshared, unsigned int value);
- DLLEXPORT int DLLCALL sem_post(sem_t*);
- DLLEXPORT int DLLCALL sem_getvalue(sem_t*, int* value);
- DLLEXPORT int DLLCALL sem_destroy(sem_t*);
+ DLLEXPORT int sem_init(sem_t*, int pshared, unsigned int value);
+ DLLEXPORT int sem_post(sem_t*);
+ DLLEXPORT int sem_getvalue(sem_t*, int* value);
+ DLLEXPORT int sem_destroy(sem_t*);
#define sem_wait(psem) sem_trywait_block(psem,INFINITE)
#define sem_trywait(psem) sem_trywait_block(psem,0)
@@ -91,7 +75,7 @@ extern "C" {
#endif
/* NOT POSIX */
-DLLEXPORT int DLLCALL sem_trywait_block(sem_t* psem, unsigned long timeout);
+DLLEXPORT int sem_trywait_block(sem_t* psem, unsigned long timeout);
/* Change semaphore to "unsignaled" (NOT POSIX) */
diff --git a/src/xpdev/threadwrap.h b/src/xpdev/threadwrap.h
index 9bb64ba912..29638b532e 100644
--- a/src/xpdev/threadwrap.h
+++ b/src/xpdev/threadwrap.h
@@ -1,8 +1,5 @@
/* Thread-related cross-platform development wrappers */
-/* $Id: threadwrap.h,v 1.52 2019/07/24 04:15:24 rswindell Exp $ */
-// vi: tabstop=4
-
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
@@ -16,21 +13,9 @@
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
- * Anonymous FTP access to the most recent released source is available at *
- * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
- * *
- * Anonymous CVS access to the development source and modification history *
- * is available at cvs.synchro.net:/cvsroot/sbbs, example: *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
- * (just hit return, no password is necessary) *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
- * *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
- * You are encouraged to submit any modifications (preferably in Unix diff *
- * format) via e-mail to mods@synchro.net *
- * *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
@@ -38,7 +23,7 @@
#define _THREADWRAP_H
#include "gen_defs.h" /* HANDLE */
-#include "wrapdll.h" /* DLLEXPORT and DLLCALL */
+#include "wrapdll.h" /* DLLEXPORT and */
#if !__STDC_NO_ATOMICS__
#if defined __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9)) && !defined(__llvm__) && !defined(__INTEL_COMPILER)
@@ -130,11 +115,11 @@ pthread_mutex_t pthread_mutex_initializer_np(BOOL recursive);
#else
-DLLEXPORT int DLLCALL pthread_mutex_init(pthread_mutex_t*, void* attr);
-DLLEXPORT int DLLCALL pthread_mutex_lock(pthread_mutex_t*);
-DLLEXPORT int DLLCALL pthread_mutex_trylock(pthread_mutex_t*);
-DLLEXPORT int DLLCALL pthread_mutex_unlock(pthread_mutex_t*);
-DLLEXPORT int DLLCALL pthread_mutex_destroy(pthread_mutex_t*);
+DLLEXPORT int pthread_mutex_init(pthread_mutex_t*, void* attr);
+DLLEXPORT int pthread_mutex_lock(pthread_mutex_t*);
+DLLEXPORT int pthread_mutex_trylock(pthread_mutex_t*);
+DLLEXPORT int pthread_mutex_unlock(pthread_mutex_t*);
+DLLEXPORT int pthread_mutex_destroy(pthread_mutex_t*);
#define SetThreadName(c)
@@ -144,7 +129,7 @@ typedef struct {
} pthread_once_t;
#define PTHREAD_ONCE_INIT {0};
-DLLEXPORT int DLLCALL pthread_once(pthread_once_t *oc, void (*init)(void));
+DLLEXPORT int pthread_once(pthread_once_t *oc, void (*init)(void));
#endif
@@ -269,18 +254,18 @@ typedef struct {
#define protected_uint64_adjust_fetch(a, b) protected_uint64_adjust(a, b)
/* Return 0 on success, non-zero on failure (see pthread_mutex_init): */
-DLLEXPORT void DLLCALL protected_int32_init(protected_int32_t*, int32_t value);
-DLLEXPORT void DLLCALL protected_int64_init(protected_int64_t*, int64_t value);
+DLLEXPORT void protected_int32_init(protected_int32_t*, int32_t value);
+DLLEXPORT void protected_int64_init(protected_int64_t*, int64_t value);
/* Return new value: */
-DLLEXPORT int32_t DLLCALL protected_int32_adjust(protected_int32_t*, int32_t adjustment);
-DLLEXPORT int32_t DLLCALL protected_int32_set(protected_int32_t*, int32_t val);
-DLLEXPORT uint32_t DLLCALL protected_uint32_adjust(protected_uint32_t*, int32_t adjustment);
-DLLEXPORT uint32_t DLLCALL protected_uint32_set(protected_uint32_t*, uint32_t val);
-DLLEXPORT int64_t DLLCALL protected_int64_adjust(protected_int64_t*, int64_t adjustment);
-DLLEXPORT int64_t DLLCALL protected_int64_set(protected_int64_t*, int64_t val);
-DLLEXPORT uint64_t DLLCALL protected_uint64_adjust(protected_uint64_t*, int64_t adjustment);
-DLLEXPORT uint64_t DLLCALL protected_uint64_set(protected_uint64_t*, uint64_t adjustment);
+DLLEXPORT int32_t protected_int32_adjust(protected_int32_t*, int32_t adjustment);
+DLLEXPORT int32_t protected_int32_set(protected_int32_t*, int32_t val);
+DLLEXPORT uint32_t protected_uint32_adjust(protected_uint32_t*, int32_t adjustment);
+DLLEXPORT uint32_t protected_uint32_set(protected_uint32_t*, uint32_t val);
+DLLEXPORT int64_t protected_int64_adjust(protected_int64_t*, int64_t adjustment);
+DLLEXPORT int64_t protected_int64_set(protected_int64_t*, int64_t val);
+DLLEXPORT uint64_t protected_uint64_adjust(protected_uint64_t*, int64_t adjustment);
+DLLEXPORT uint64_t protected_uint64_set(protected_uint64_t*, uint64_t adjustment);
#endif
diff --git a/src/xpdev/wrapdll.h b/src/xpdev/wrapdll.h
index a3bb5f1109..74f9ecea58 100644
--- a/src/xpdev/wrapdll.h
+++ b/src/xpdev/wrapdll.h
@@ -1,8 +1,4 @@
-/* wrapdll.h */
-
-/* Defines DLLEXPORT and DLLCALL for cross-platform development wrappers */
-
-/* $Id: wrapdll.h,v 1.8 2019/03/22 21:29:46 rswindell Exp $ */
+/* Defines DLLEXPORT for cross-platform development wrappers */
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
@@ -17,30 +13,15 @@
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
- * Anonymous FTP access to the most recent released source is available at *
- * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
- * *
- * Anonymous CVS access to the development source and modification history *
- * is available at cvs.synchro.net:/cvsroot/sbbs, example: *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
- * (just hit return, no password is necessary) *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
- * *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
- * You are encouraged to submit any modifications (preferably in Unix diff *
- * format) via e-mail to mods@synchro.net *
- * *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
#if defined(DLLEXPORT)
#undef DLLEXPORT
#endif
-#if defined(DLLCALL)
- #undef DLLCALL
-#endif
#if defined(_WIN32) && (defined(WRAPPER_IMPORTS) || defined(WRAPPER_EXPORTS))
#if defined(WRAPPER_IMPORTS)
@@ -48,13 +29,7 @@
#else
#define DLLEXPORT __declspec(dllexport)
#endif
- #if defined(__BORLANDC__)
- #define DLLCALL
- #else
- #define DLLCALL
- #endif
#else /* !_WIN32 || !_DLL*/
#define DLLEXPORT
- #define DLLCALL
#endif
diff --git a/src/xpdev/xp_dl.h b/src/xpdev/xp_dl.h
index 652bff508c..70779a6628 100644
--- a/src/xpdev/xp_dl.h
+++ b/src/xpdev/xp_dl.h
@@ -8,14 +8,14 @@
#include <dlfcn.h>
typedef void * dll_handle;
- DLLEXPORT dll_handle DLLCALL xp_dlopen(const char **name, int mode, int major);
+ DLLEXPORT dll_handle xp_dlopen(const char **name, int mode, int major);
#define xp_dlsym(handle, name) dlsym(handle, #name)
#define xp_dlclose(handle) dlclose(handle)
#elif defined(_WIN32)
#include <windows.h>
typedef HMODULE dll_handle;
- DLLEXPORT dll_handle DLLCALL xp_dlopen(const char **name, int mode, int major);
+ DLLEXPORT dll_handle xp_dlopen(const char **name, int mode, int major);
#define xp_dlsym(handle, name) ((void *)GetProcAddress(handle, #name))
#define xp_dlclose(handle) (FreeLibrary(handle)?0:-1)
diff --git a/src/xpdev/xpbeep.c b/src/xpdev/xpbeep.c
index d1059f1ada..274aa90065 100644
--- a/src/xpdev/xpbeep.c
+++ b/src/xpdev/xpbeep.c
@@ -218,7 +218,7 @@ static BOOL xp_play_sample_locked(const unsigned char *sample, size_t size, BOOL
/********************************************************************************/
/* Calculate and generate a sound wave pattern (thanks to Deuce!) */
/********************************************************************************/
-void DLLCALL xptone_makewave(double freq, unsigned char *wave, int samples, enum WAVE_SHAPE shape)
+void xptone_makewave(double freq, unsigned char *wave, int samples, enum WAVE_SHAPE shape)
{
int i;
int midpoint;
@@ -344,7 +344,7 @@ static int portaudio_callback(void *inputBuffer
#endif
#ifdef WITH_SDL_AUDIO
-void DLLCALL sdl_fillbuf(void *userdata, Uint8 *stream, int len)
+void sdl_fillbuf(void *userdata, Uint8 *stream, int len)
{
int copylen=len;
int maxlen=sdl_audio_buf_len-sdl_audio_buf_pos;
@@ -373,7 +373,7 @@ void DLLCALL sdl_fillbuf(void *userdata, Uint8 *stream, int len)
pthread_once_t sample_initialized_pto = PTHREAD_ONCE_INIT;
#endif
static BOOL
-DLLCALL xptone_open_locked(void)
+xptone_open_locked(void)
{
#ifdef _WIN32
WAVEFORMATEX w;
@@ -652,7 +652,7 @@ DLLCALL xptone_open_locked(void)
}
BOOL
-DLLCALL xptone_open(void)
+xptone_open(void)
{
BOOL ret;
#ifdef XPDEV_THREAD_SAFE
@@ -666,7 +666,7 @@ DLLCALL xptone_open(void)
return ret;
}
-static void DLLCALL
+static void
xptone_complete_locked(void)
{
if(handle_type==SOUND_DEVICE_CLOSED) {
@@ -727,7 +727,7 @@ xptone_complete_locked(void)
#endif
}
-void DLLCALL
+void
xptone_complete(void)
{
#ifdef XPDEV_THREAD_SAFE
@@ -739,7 +739,7 @@ xptone_complete(void)
#endif
}
-BOOL DLLCALL xptone_close_locked(void)
+BOOL xptone_close_locked(void)
{
xptone_complete_locked();
@@ -805,7 +805,7 @@ BOOL DLLCALL xptone_close_locked(void)
}
BOOL
-DLLCALL xptone_close(void)
+xptone_close(void)
{
BOOL ret;
@@ -976,7 +976,7 @@ do_xp_play_sample(const unsigned char *sampo, size_t sz, int *freed)
}
#ifdef XPDEV_THREAD_SAFE
-void DLLCALL xp_play_sample_thread(void *data)
+void xp_play_sample_thread(void *data)
{
BOOL must_close;
BOOL posted_last=TRUE;
@@ -1102,7 +1102,7 @@ static BOOL xp_play_sample_locked(const unsigned char *sample, size_t size, BOOL
* This MUST not return false after sample goes into the sample buffer in the background.
* If it does, the caller won't be able to free() it.
*/
-BOOL DLLCALL xp_play_sample(const unsigned char *sample, size_t size, BOOL background)
+BOOL xp_play_sample(const unsigned char *sample, size_t size, BOOL background)
{
BOOL ret;
pthread_once(&sample_initialized_pto, init_sample);
@@ -1113,7 +1113,7 @@ BOOL DLLCALL xp_play_sample(const unsigned char *sample, size_t size, BOOL backg
return(ret);
}
#else
-BOOL DLLCALL xp_play_sample(const unsigned char *sample, size_t sample_size, BOOL background)
+BOOL xp_play_sample(const unsigned char *sample, size_t sample_size, BOOL background)
{
BOOL must_close=FALSE;
BOOL ret;
@@ -1135,7 +1135,7 @@ BOOL DLLCALL xp_play_sample(const unsigned char *sample, size_t sample_size, BOO
/* Play a tone through the wave/DSP output device (sound card) - Deuce */
/********************************************************************************/
-BOOL DLLCALL xptone(double freq, DWORD duration, enum WAVE_SHAPE shape)
+BOOL xptone(double freq, DWORD duration, enum WAVE_SHAPE shape)
{
unsigned char *wave;
int samples;
@@ -1177,7 +1177,7 @@ BOOL DLLCALL xptone(double freq, DWORD duration, enum WAVE_SHAPE shape)
/* Generate a tone at specified frequency for specified milliseconds */
/* Thanks to Casey Martin (and Deuce) for this code */
/****************************************************************************/
-void DLLCALL unix_beep(int freq, int dur)
+void unix_beep(int freq, int dur)
{
static int console_fd=-1;
@@ -1221,7 +1221,7 @@ void DLLCALL unix_beep(int freq, int dur)
/********************************************************************************/
/* Play sound through DSP/wave device, if unsuccessful, play through PC speaker */
/********************************************************************************/
-void DLLCALL xpbeep(double freq, DWORD duration)
+void xpbeep(double freq, DWORD duration)
{
if(xptone(freq,duration,WAVE_SHAPE_SINE_SAW_HARM))
return;
diff --git a/src/xpdev/xpbeep.h b/src/xpdev/xpbeep.h
index be3e3342fe..93bac7d7b8 100644
--- a/src/xpdev/xpbeep.h
+++ b/src/xpdev/xpbeep.h
@@ -34,15 +34,15 @@ enum WAVE_SHAPE {
#ifdef __cplusplus
extern "C" {
#endif
-DLLEXPORT void DLLCALL xptone_makewave(double freq, unsigned char *wave, int samples, enum WAVE_SHAPE shape);
-DLLEXPORT BOOL DLLCALL xptone_open(void);
-DLLEXPORT BOOL DLLCALL xptone_close(void);
-DLLEXPORT void DLLCALL xpbeep(double freq, DWORD duration);
-DLLEXPORT BOOL DLLCALL xp_play_sample(const unsigned char *sample, size_t sample_size, BOOL background);
-DLLEXPORT void DLLCALL xptone_complete(void);
-DLLEXPORT BOOL DLLCALL xptone(double freq, DWORD duration, enum WAVE_SHAPE);
+DLLEXPORT void xptone_makewave(double freq, unsigned char *wave, int samples, enum WAVE_SHAPE shape);
+DLLEXPORT BOOL xptone_open(void);
+DLLEXPORT BOOL xptone_close(void);
+DLLEXPORT void xpbeep(double freq, DWORD duration);
+DLLEXPORT BOOL xp_play_sample(const unsigned char *sample, size_t sample_size, BOOL background);
+DLLEXPORT void xptone_complete(void);
+DLLEXPORT BOOL xptone(double freq, DWORD duration, enum WAVE_SHAPE);
#ifdef __unix__
-DLLEXPORT void DLLCALL unix_beep(int freq, int dur);
+DLLEXPORT void unix_beep(int freq, int dur);
#endif
#ifdef __cplusplus
}
diff --git a/src/xpdev/xpdatetime.h b/src/xpdev/xpdatetime.h
index bd9dc0fd2c..74f91c2a76 100644
--- a/src/xpdev/xpdatetime.h
+++ b/src/xpdev/xpdatetime.h
@@ -1,9 +1,5 @@
-/* xpdatetime.h */
-
/* Cross-platform (and eXtra Precision) date/time functions */
-/* $Id: xpdatetime.h,v 1.5 2015/09/02 07:45:19 rswindell Exp $ */
-
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
@@ -17,21 +13,9 @@
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
- * Anonymous FTP access to the most recent released source is available at *
- * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
- * *
- * Anonymous CVS access to the development source and modification history *
- * is available at cvs.synchro.net:/cvsroot/sbbs, example: *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
- * (just hit return, no password is necessary) *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
- * *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
- * You are encouraged to submit any modifications (preferably in Unix diff *
- * format) via e-mail to mods@synchro.net *
- * *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
@@ -73,16 +57,16 @@ typedef struct {
xpTimeZone_t zone; /* minutes +/- UTC */
} xpDateTime_t;
-DLLEXPORT xpDateTime_t DLLCALL xpDateTime_create(unsigned year, unsigned month, unsigned day
+DLLEXPORT xpDateTime_t xpDateTime_create(unsigned year, unsigned month, unsigned day
,unsigned hour, unsigned minute, float second
,xpTimeZone_t);
-DLLEXPORT xpDateTime_t DLLCALL xpDateTime_now(void);
-DLLEXPORT time_t DLLCALL xpDateTime_to_time(xpDateTime_t);
-DLLEXPORT time_t DLLCALL xpDateTime_to_localtime(xpDateTime_t);
-DLLEXPORT xpDate_t DLLCALL time_to_xpDate(time_t);
-DLLEXPORT xpDateTime_t DLLCALL time_to_xpDateTime(time_t, xpTimeZone_t);
-DLLEXPORT xpDateTime_t DLLCALL gmtime_to_xpDateTime(time_t);
-DLLEXPORT xpTimeZone_t DLLCALL xpTimeZone_local(void);
+DLLEXPORT xpDateTime_t xpDateTime_now(void);
+DLLEXPORT time_t xpDateTime_to_time(xpDateTime_t);
+DLLEXPORT time_t xpDateTime_to_localtime(xpDateTime_t);
+DLLEXPORT xpDate_t time_to_xpDate(time_t);
+DLLEXPORT xpDateTime_t time_to_xpDateTime(time_t, xpTimeZone_t);
+DLLEXPORT xpDateTime_t gmtime_to_xpDateTime(time_t);
+DLLEXPORT xpTimeZone_t xpTimeZone_local(void);
/**********************************************/
/* Decimal-coded ISO-8601 date/time functions */
@@ -102,17 +86,17 @@ typedef uint32_t isoTime_t; /* HHMMSS (decimal) */
#define isoTime_minute(time) (((time)/100)%100)
#define isoTime_second(time) ((time)%100)
-DLLEXPORT BOOL DLLCALL isoTimeZoneStr_parse(const char* str, xpTimeZone_t*);
-DLLEXPORT xpDateTime_t DLLCALL isoDateTimeStr_parse(const char* str);
+DLLEXPORT BOOL isoTimeZoneStr_parse(const char* str, xpTimeZone_t*);
+DLLEXPORT xpDateTime_t isoDateTimeStr_parse(const char* str);
/**************************************************************/
/* Conversion between time_t (local and GMT) and isoDate/Time */
/**************************************************************/
-DLLEXPORT isoTime_t DLLCALL time_to_isoTime(time_t);
-DLLEXPORT isoTime_t DLLCALL gmtime_to_isoTime(time_t);
-DLLEXPORT isoDate_t DLLCALL time_to_isoDateTime(time_t, isoTime_t*);
-DLLEXPORT isoDate_t DLLCALL gmtime_to_isoDateTime(time_t, isoTime_t*);
-DLLEXPORT time_t DLLCALL isoDateTime_to_time(isoDate_t, isoTime_t);
+DLLEXPORT isoTime_t time_to_isoTime(time_t);
+DLLEXPORT isoTime_t gmtime_to_isoTime(time_t);
+DLLEXPORT isoDate_t time_to_isoDateTime(time_t, isoTime_t*);
+DLLEXPORT isoDate_t gmtime_to_isoDateTime(time_t, isoTime_t*);
+DLLEXPORT time_t isoDateTime_to_time(isoDate_t, isoTime_t);
#define time_to_isoDate(t) time_to_isoDateTime(t,NULL)
#define gmtime_to_isoDate(t) gmtime_to_isoDateTime(t,NULL)
@@ -123,8 +107,8 @@ DLLEXPORT time_t DLLCALL isoDateTime_to_time(isoDate_t, isoTime_t);
#define xpDate_to_isoDate(date) isoDate_create((date).year,(date).month,(date).day)
#define xpTime_to_isoTime(time) isoTime_create((time).hour,(time).minute,(unsigned)((time).second))
-DLLEXPORT xpDateTime_t DLLCALL isoDateTime_to_xpDateTime(isoDate_t, isoTime_t);
-DLLEXPORT isoDate_t DLLCALL xpDateTime_to_isoDateTime(xpDateTime_t, isoTime_t*);
+DLLEXPORT xpDateTime_t isoDateTime_to_xpDateTime(isoDate_t, isoTime_t);
+DLLEXPORT isoDate_t xpDateTime_to_isoDateTime(xpDateTime_t, isoTime_t*);
/*****************************************************************/
/* Conversion from xpDate/Time/Zone to isoDate/Time/Zone Strings */
@@ -140,17 +124,17 @@ DLLEXPORT isoDate_t DLLCALL xpDateTime_to_isoDateTime(xpDateTime_t, isoTime_t*)
* 2 "14.02:39.82"
* 3 "14.02:39.829"
*/
-DLLEXPORT char* DLLCALL xpDate_to_isoDateStr(xpDate_t
+DLLEXPORT char* xpDate_to_isoDateStr(xpDate_t
,const char* sep
,char* str, size_t maxlen);
-DLLEXPORT char* DLLCALL xpTime_to_isoTimeStr(xpTime_t
+DLLEXPORT char* xpTime_to_isoTimeStr(xpTime_t
,const char* sep
,int precision
,char* str, size_t maxlen);
-DLLEXPORT char* DLLCALL xpTimeZone_to_isoTimeZoneStr(xpTimeZone_t
+DLLEXPORT char* xpTimeZone_to_isoTimeZoneStr(xpTimeZone_t
,const char* sep
,char *str, size_t maxlen);
-DLLEXPORT char* DLLCALL xpDateTime_to_isoDateTimeStr(xpDateTime_t
+DLLEXPORT char* xpDateTime_to_isoDateTimeStr(xpDateTime_t
,const char* date_sep, const char* datetime_sep, const char* time_sep
,int precision
,char* str, size_t maxlen);
diff --git a/src/xpdev/xpmap.h b/src/xpdev/xpmap.h
index c94fe10149..5f1ffd664c 100644
--- a/src/xpdev/xpmap.h
+++ b/src/xpdev/xpmap.h
@@ -1,9 +1,5 @@
-/* xpmap.h */
-
/* mmap() style cross-platform development wrappers */
-/* $Id: xpmap.h,v 1.5 2018/07/24 01:13:10 rswindell Exp $ */
-
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
@@ -17,21 +13,9 @@
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
- * Anonymous FTP access to the most recent released source is available at *
- * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
- * *
- * Anonymous CVS access to the development source and modification history *
- * is available at cvs.synchro.net:/cvsroot/sbbs, example: *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
- * (just hit return, no password is necessary) *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
- * *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
- * You are encouraged to submit any modifications (preferably in Unix diff *
- * format) via e-mail to mods@synchro.net *
- * *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
@@ -71,7 +55,7 @@ struct xpmapping {
#endif
-DLLEXPORT struct xpmapping* DLLCALL xpmap(const char *filename, enum xpmap_type type);
-DLLEXPORT void DLLCALL xpunmap(struct xpmapping *map);
+DLLEXPORT struct xpmapping* xpmap(const char *filename, enum xpmap_type type);
+DLLEXPORT void xpunmap(struct xpmapping *map);
#endif
diff --git a/src/xpdev/xpprintf.h b/src/xpdev/xpprintf.h
index a37af6ee87..940c68ec41 100644
--- a/src/xpdev/xpprintf.h
+++ b/src/xpdev/xpprintf.h
@@ -1,9 +1,5 @@
-/* xpprintf.h */
-
/* Deuce's vs[n]printf() replacement */
-/* $Id: xpprintf.h,v 1.17 2019/07/24 04:12:54 rswindell Exp $ */
-
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
@@ -17,25 +13,12 @@
* See the GNU Lesser General Public License for more details: lgpl.txt or *
* http://www.fsf.org/copyleft/lesser.html *
* *
- * Anonymous FTP access to the most recent released source is available at *
- * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
- * *
- * Anonymous CVS access to the development source and modification history *
- * is available at cvs.synchro.net:/cvsroot/sbbs, example: *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
- * (just hit return, no password is necessary) *
- * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
- * *
* For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html *
* *
- * You are encouraged to submit any modifications (preferably in Unix diff *
- * format) via e-mail to mods@synchro.net *
- * *
* Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/
-
#ifndef _XPPRINTF_H_
#define _XPPRINTF_H_
@@ -72,16 +55,16 @@
#if defined(__cplusplus)
extern "C" {
#endif
-DLLEXPORT void DLLCALL xp_asprintf_free(char *format);
-DLLEXPORT char* DLLCALL xp_asprintf_start(const char *format);
-DLLEXPORT char* DLLCALL xp_asprintf_next(char *format, int type, ...);
-DLLEXPORT char* DLLCALL xp_asprintf_end(char *format, size_t *endlen);
-DLLEXPORT char* DLLCALL xp_asprintf(const char *format, ...);
-DLLEXPORT char* DLLCALL xp_vasprintf(const char *format, va_list va);
-DLLEXPORT int DLLCALL xp_printf_get_type(const char *format);
+DLLEXPORT void xp_asprintf_free(char *format);
+DLLEXPORT char* xp_asprintf_start(const char *format);
+DLLEXPORT char* xp_asprintf_next(char *format, int type, ...);
+DLLEXPORT char* xp_asprintf_end(char *format, size_t *endlen);
+DLLEXPORT char* xp_asprintf(const char *format, ...);
+DLLEXPORT char* xp_vasprintf(const char *format, va_list va);
+DLLEXPORT int xp_printf_get_type(const char *format);
#if defined(_MSC_VER) || defined(__MSVCRT__) || defined(__BORLANDC__)
-DLLEXPORT int DLLCALL vasprintf(char **strptr, const char *format, va_list va);
-DLLEXPORT int DLLCALL asprintf(char **strptr, const char *format, ...);
+DLLEXPORT int vasprintf(char **strptr, const char *format, va_list va);
+DLLEXPORT int asprintf(char **strptr, const char *format, ...);
#endif
#if defined(__cplusplus)
--
GitLab