From a981d984a2f1995a0b17fe13dd51f1c56c077899 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Sun, 23 Dec 2007 09:55:46 +0100
Subject: [PATCH] remove ScreenInfo typedef and move Area into screen.h

---
 config.h | 10 ----------
 screen.c |  2 +-
 screen.h |  9 ++++++++-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/config.h b/config.h
index b661f3ceb..2b326f086 100644
--- a/config.h
+++ b/config.h
@@ -51,16 +51,6 @@ struct Rule
 
 typedef struct AwesomeConf AwesomeConf;
 
-typedef struct Area Area;
-struct Area
-{
-    /* Co-ords of upper left corner */
-    int x;
-    int y;
-    int width;
-    int height;
-};
-
 typedef struct Layout Layout;
 struct Layout
 {
diff --git a/screen.c b/screen.c
index 25f078ddd..fad668f02 100644
--- a/screen.c
+++ b/screen.c
@@ -38,7 +38,7 @@ Area
 get_screen_area(int screen, Statusbar *statusbar, Padding *padding)
 {
     int screen_number = 0;
-    ScreenInfo *si;
+    XineramaScreenInfo *si;
     Area area;
 
     if(XineramaIsActive(globalconf.display)){
diff --git a/screen.h b/screen.h
index 2a264e588..9dbd823b0 100644
--- a/screen.h
+++ b/screen.h
@@ -26,7 +26,14 @@
 
 #include <X11/extensions/Xinerama.h>
 
-typedef XineramaScreenInfo ScreenInfo;
+typedef struct
+{
+    /* Co-ords of upper left corner */
+    int x;
+    int y;
+    int width;
+    int height;
+} Area;
 
 Area get_screen_area(int, Statusbar *, Padding *);
 Area get_display_area(int, Statusbar *, Padding *);