make ob_exit() take an error code. don't exit with 0 for signals other than TERM...

[chaz/openbox] / openbox / extensions.h

diff --git a/openbox/extensions.h b/openbox/extensions.h
index c07076e787cd8527f9230a1ab48e6db708286af1..e7791e9280d511462280b84fe9651b68e98324af 100644 (file)
--- a/openbox/extensions.h
+++ b/openbox/extensions.h
@@ -1,7 +1,10 @@
 #ifndef __extensions_h
 #define __extensions_h
 
+#include "geom.h"
+
 #include <X11/Xlib.h>
+#include <X11/Xutil.h> /* shape.h uses Region which is in here */
 #ifdef    XKB
 #include <X11/XKBlib.h>
 #endif
@@ -17,6 +20,7 @@
 #ifdef    VIDMODE
 #include <X11/extensions/xf86vmode.h>
 #endif
+
 #include <glib.h>
 
 /*! Does the display have the XKB extension? */
@@ -33,8 +37,6 @@ extern int extensions_shape_event_basep;
 extern gboolean extensions_xinerama;
 /*! Base for events for the Xinerama extension */
 extern int extensions_xinerama_event_basep;
-/*! Is Xinerama enabled? */
-extern gboolean extensions_xinerama_active;
 
 /*! Does the display have the RandR extension? */
 extern gboolean extensions_randr;
@@ -48,6 +50,6 @@ extern int extensions_vidmode_event_basep;
 
 void extensions_query_all();
 
-void extensions_xinerama_screens(Rect **xin_areas, guint *nxin);
-
+void extensions_xinerama_screens(Rect **areas, guint *nxin);
+  
 #endif