X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=57d838e105d269ad4583c5112258ab472f3ecae2;hb=99d0b716776492c1927b8248375ce82a33bc7b26;hp=9c42fcbcf4b715ee47b3947b11ddb0cc665e15f2;hpb=121afb76eb7f8b5a071bb45d262c6fc43ce82dff;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index 9c42fcbc..57d838e1 100644
--- a/render/font.c
+++ b/render/font.c
@@ -2,13 +2,12 @@
 #include "color.h"
 #include "mask.h"
 #include "theme.h"
-#include "kernel/geom.h"
-#include "kernel/gettext.h"
-#define _(str) gettext(str)
+#include "gettext.h"
 
 #include <X11/Xft/Xft.h>
 #include <glib.h>
 #include <string.h>
+#include <stdlib.h>
 
 #define ELIPSES "..."
 #define ELIPSES_LENGTH(font) \
@@ -148,7 +147,7 @@ int RrFontMaxCharWidth(const RrFont *f)
     return (signed) f->xftfont->max_advance_width;
 }
 
-void RrFontDraw(XftDraw *d, RrTextureText *t, Rect *area)
+void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
 {
     gint x,y,w,h;
     XftColor c;