Skip to content
Snippets Groups Projects
Commit 6f8041a2 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Move all exported variables into extern "C" block

parent 9166b520
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #2766 passed
...@@ -241,10 +241,6 @@ struct text_info { ...@@ -241,10 +241,6 @@ struct text_info {
unsigned char cury; /* y-coordinate in current window */ unsigned char cury; /* y-coordinate in current window */
}; };
CIOLIBEXPORTVAR struct text_info cio_textinfo;
CIOLIBEXPORTVAR uint32_t ciolib_fg;
CIOLIBEXPORTVAR uint32_t ciolib_bg;
struct mouse_event { struct mouse_event {
int event; int event;
int bstate; int bstate;
...@@ -267,8 +263,6 @@ struct conio_font_data_struct { ...@@ -267,8 +263,6 @@ struct conio_font_data_struct {
enum ciolib_codepage cp; enum ciolib_codepage cp;
}; };
CIOLIBEXPORTVAR struct conio_font_data_struct conio_fontdata[257];
struct ciolib_pixels { struct ciolib_pixels {
uint32_t *pixels; uint32_t *pixels;
uint32_t *pixelsb; uint32_t *pixelsb;
...@@ -386,6 +380,15 @@ typedef struct { ...@@ -386,6 +380,15 @@ typedef struct {
void (*setwinposition) (int x, int y); void (*setwinposition) (int x, int y);
} cioapi_t; } cioapi_t;
#define _conio_kbhit() kbhit()
#ifdef __cplusplus
extern "C" {
#endif
CIOLIBEXPORTVAR struct text_info cio_textinfo;
CIOLIBEXPORTVAR struct conio_font_data_struct conio_fontdata[257];
CIOLIBEXPORTVAR uint32_t ciolib_fg;
CIOLIBEXPORTVAR uint32_t ciolib_bg;
CIOLIBEXPORTVAR cioapi_t cio_api; CIOLIBEXPORTVAR cioapi_t cio_api;
CIOLIBEXPORTVAR int _wscroll; CIOLIBEXPORTVAR int _wscroll;
CIOLIBEXPORTVAR int directvideo; CIOLIBEXPORTVAR int directvideo;
...@@ -396,11 +399,6 @@ CIOLIBEXPORTVAR char *ciolib_appname; ...@@ -396,11 +399,6 @@ CIOLIBEXPORTVAR char *ciolib_appname;
CIOLIBEXPORTVAR int ciolib_initial_window_height; CIOLIBEXPORTVAR int ciolib_initial_window_height;
CIOLIBEXPORTVAR int ciolib_initial_window_width; CIOLIBEXPORTVAR int ciolib_initial_window_width;
#define _conio_kbhit() kbhit()
#ifdef __cplusplus
extern "C" {
#endif
CIOLIBEXPORT int initciolib(int mode); CIOLIBEXPORT int initciolib(int mode);
CIOLIBEXPORT void suspendciolib(void); CIOLIBEXPORT void suspendciolib(void);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment