made Fnt an anonymous struct

diff --git a/config.mk b/config.mk
index 195fd4c673326eb1a21aeb788314a1f9575ef888..525ef178c518d5c03f18006a6ddd5eb6119e6ed1 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 2.3
+VERSION = 2.4
 
 # Customize below to fit your system
 

diff --git a/dmenu.h b/dmenu.h
index bb3b144e621becbb134c29ba1509398190c731e1..21746885bde8e173d9e837b6f1cf3baa9a6d9d69 100644 (file)
--- a/dmenu.h
+++ b/dmenu.h
@@ -14,25 +14,20 @@
 /* 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;
-       Fnt font;
        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;