typedefs instead of #defines

Replaced #defines with typedefs where possible, patch attached.
dev
noname@inventati.org 2014-04-05 20:54:01 +04:00 committed by Roberto E. Vargas Caballero
parent b8d6171cb0
commit dc74c4f729
1 changed files with 5 additions and 5 deletions

10
st.c
View File

@ -36,10 +36,6 @@ char *argv0;
#define Glyph Glyph_ #define Glyph Glyph_
#define Font Font_ #define Font Font_
#define Draw XftDraw *
#define Colour XftColor
#define Colourmap Colormap
#define Rectangle XRectangle
#if defined(__linux) #if defined(__linux)
#include <pty.h> #include <pty.h>
@ -180,6 +176,10 @@ typedef unsigned int uint;
typedef unsigned long ulong; typedef unsigned long ulong;
typedef unsigned short ushort; typedef unsigned short ushort;
typedef XftDraw *Draw;
typedef XftColor Colour;
typedef Colormap Colourmap;
typedef struct { typedef struct {
char c[UTF_SIZ]; /* character code */ char c[UTF_SIZ]; /* character code */
ushort mode; /* attribute flags */ ushort mode; /* attribute flags */
@ -3110,7 +3110,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
FcCharSet *fccharset; FcCharSet *fccharset;
Colour *fg, *bg, *temp, revfg, revbg, truefg, truebg; Colour *fg, *bg, *temp, revfg, revbg, truefg, truebg;
XRenderColor colfg, colbg; XRenderColor colfg, colbg;
Rectangle r; XRectangle r;
int oneatatime; int oneatatime;
frcflags = FRC_NORMAL; frcflags = FRC_NORMAL;