From: noname@inventati.org Date: Sat, 5 Apr 2014 16:54:01 +0000 (+0400) Subject: typedefs instead of #defines X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=dc74c4f729a4350267f269c767aa6e377d8d4fbc;p=st.git typedefs instead of #defines Replaced #defines with typedefs where possible, patch attached. --- diff --git a/st.c b/st.c index 70caf82..df660ff 100644 --- a/st.c +++ b/st.c @@ -36,10 +36,6 @@ char *argv0; #define Glyph Glyph_ #define Font Font_ -#define Draw XftDraw * -#define Colour XftColor -#define Colourmap Colormap -#define Rectangle XRectangle #if defined(__linux) #include @@ -180,6 +176,10 @@ typedef unsigned int uint; typedef unsigned long ulong; typedef unsigned short ushort; +typedef XftDraw *Draw; +typedef XftColor Colour; +typedef Colormap Colourmap; + typedef struct { char c[UTF_SIZ]; /* character code */ ushort mode; /* attribute flags */ @@ -3110,7 +3110,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { FcCharSet *fccharset; Colour *fg, *bg, *temp, revfg, revbg, truefg, truebg; XRenderColor colfg, colbg; - Rectangle r; + XRectangle r; int oneatatime; frcflags = FRC_NORMAL;