aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoname@inventati.org <noname@inventati.org>2014-04-05 20:54:01 +0400
committerRoberto E. Vargas Caballero <k0ga@shike2.com>2014-04-15 08:14:46 +0200
commitdc74c4f729a4350267f269c767aa6e377d8d4fbc (patch)
treef40de9adf0d3b4df85c60a589a682947b72ec943
parentb8d6171cb00c28e4c90e58e101554097003b59d3 (diff)
downloadst-dc74c4f729a4350267f269c767aa6e377d8d4fbc.tar.gz
typedefs instead of #defines
Replaced #defines with typedefs where possible, patch attached.
-rw-r--r--st.c10
1 files changed, 5 insertions, 5 deletions
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 <pty.h>
@@ -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;