made Fnt an anonymous struct

diff --git a/config.mk b/config.mk
index 195fd4c..525ef17 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dmenu version
 # dmenu version

-VERSION = 2.3
+VERSION = 2.4

 
 # Customize below to fit your system
 
 
 # Customize below to fit your system
 

diff --git a/dmenu.h b/dmenu.h
index bb3b144..2174688 100644 (file)
--- a/dmenu.h
+++ b/dmenu.h
@@ -14,25 +14,20 @@
 /* color */
 enum { ColFG, ColBG, ColLast };
 
 /* color */
 enum { ColFG, ColBG, ColLast };
 

-typedef struct DC DC;
-typedef struct Fnt Fnt;
-
-struct Fnt {
-       XFontStruct *xfont;
-       XFontSet set;
-       int ascent;
-       int descent;
-       int height;
-};
-
-struct DC {
+typedef struct {

        int x, y, w, h;
        unsigned long norm[ColLast];
        unsigned long sel[ColLast];
        Drawable drawable;
        int x, y, w, h;
        unsigned long norm[ColLast];
        unsigned long sel[ColLast];
        Drawable drawable;

-       Fnt font;

        GC gc;
        GC gc;

-}; /* draw context */
+       struct {
+               XFontStruct *xfont;
+               XFontSet set;
+               int ascent;
+               int descent;
+               int height;
+       } font;
+} DC; /* draw context */

 
 extern int screen;
 extern Display *dpy;
 
 extern int screen;
 extern Display *dpy;