From 5b81cfe30cd62aa4a9b5f483672ad733c2c0821e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Wed, 23 Feb 2022 16:06:52 -0500
Subject: [PATCH] Move all exported variables into extern "C" block
---
src/conio/ciolib.h | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/conio/ciolib.h b/src/conio/ciolib.h
index ba56dfdc91..250f4e9941 100644
--- a/src/conio/ciolib.h
+++ b/src/conio/ciolib.h
@@ -241,10 +241,6 @@ struct text_info {
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 {
int event;
int bstate;
@@ -267,8 +263,6 @@ struct conio_font_data_struct {
enum ciolib_codepage cp;
};
-CIOLIBEXPORTVAR struct conio_font_data_struct conio_fontdata[257];
-
struct ciolib_pixels {
uint32_t *pixels;
uint32_t *pixelsb;
@@ -386,6 +380,15 @@ typedef struct {
void (*setwinposition) (int x, int y);
} 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 int _wscroll;
CIOLIBEXPORTVAR int directvideo;
@@ -396,11 +399,6 @@ CIOLIBEXPORTVAR char *ciolib_appname;
CIOLIBEXPORTVAR int ciolib_initial_window_height;
CIOLIBEXPORTVAR int ciolib_initial_window_width;
-#define _conio_kbhit() kbhit()
-
-#ifdef __cplusplus
-extern "C" {
-#endif
CIOLIBEXPORT int initciolib(int mode);
CIOLIBEXPORT void suspendciolib(void);
--
GitLab