fix multiple definition, move globals to msgbox.c

diff --git a/msgbox.c b/msgbox.c
index 23a0cfcfdf44c0342a6ac894863394a89ccd96fe..2543b3a25120315f1fbac6b59cd432fc08760981 100644 (file)
--- a/msgbox.c
+++ b/msgbox.c
@@ -18,6 +18,27 @@
 // if font is not in usual place, we look here:
 #define FONT "/share/fonts/neutrino.ttf"
 
+FT_Error                 error;
+FT_Library               library;
+FTC_Manager              manager;
+FTC_SBitCache            cache;
+FTC_SBit         sbit;
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR == 0
+FTC_Image_Desc           desc;
+#else
+FTC_ImageTypeRec desc;
+#endif
+
+FT_Face                  face;
+FT_Bool                  use_kerning;
+FT_UInt                  prev_glyphindex;
+
+char *butmsg[MAX_BUTTONS];
+struct fb_fix_screeninfo fix_screeninfo;
+struct fb_var_screeninfo var_screeninfo;
+int startx, starty, sx, ex, sy, ey, debounce, rblock;
+int fb;
+
 //                                        CMCST,   CMCS,  CMCT,    CMC,    CMCIT,  CMCI,   CMHT,   CMH
 //                                        WHITE,   BLUE0, TRANSP,  CMS,    ORANGE, GREEN,  YELLOW, RED
 

diff --git a/msgbox.h b/msgbox.h
index a2facc0466190a2da2e8d87e8b6d227ce5fe1ced..6198b00c5dbcac1764b6f44d5319c0d80d7e84f1 100644 (file)
--- a/msgbox.h
+++ b/msgbox.h
@@ -30,19 +30,19 @@ extern unsigned char FONT[64];
 
 enum {LEFT, CENTER, RIGHT};
 
-FT_Error               error;
-FT_Library             library;
-FTC_Manager            manager;
-FTC_SBitCache          cache;
-FTC_SBit               sbit;
+extern FT_Error                error;
+extern FT_Library              library;
+extern FTC_Manager             manager;
+extern FTC_SBitCache           cache;
+extern FTC_SBit                sbit;
 #if FREETYPE_MAJOR == 2 && FREETYPE_MINOR == 0
-FTC_Image_Desc         desc;
+extern FTC_Image_Desc          desc;
 #else
-FTC_ImageTypeRec       desc;
+extern FTC_ImageTypeRec        desc;
 #endif
-FT_Face                        face;
-FT_UInt                        prev_glyphindex;
-FT_Bool                        use_kerning;
+extern FT_Face                 face;
+extern FT_UInt                 prev_glyphindex;
+extern FT_Bool                 use_kerning;
 
 // rc codes
 
@@ -102,7 +102,7 @@ FT_Bool                     use_kerning;
 
 //devs
 
-int fb;
+extern int fb;
 
 //framebuffer stuff
 
@@ -118,13 +118,13 @@ extern int TABULATOR;
 
 extern unsigned char *lfb, *lbb, *obb, *hbb;
 
-struct fb_fix_screeninfo fix_screeninfo;
-struct fb_var_screeninfo var_screeninfo;
+extern struct fb_fix_screeninfo fix_screeninfo;
+extern struct fb_var_screeninfo var_screeninfo;
 extern unsigned char rd[],gn[],bl[],tr[];
 
-int startx, starty, sx, ex, sy, ey, debounce, rblock;
+extern int startx, starty, sx, ex, sy, ey, debounce, rblock;
 extern unsigned char sc[8], tc[8];
-char *butmsg[MAX_BUTTONS];
+extern char *butmsg[MAX_BUTTONS];
 extern int buttons,selection;
 extern int instance;
 int get_instance(void);