xserver: Branch 'xorg-server-1.2-apple'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Thu Nov 29 00:44:35 PST 2007
hw/darwin/darwin.c | 4 +++-
hw/darwin/darwin.h | 3 ---
hw/darwin/darwinEvents.c | 4 ++++
hw/darwin/darwinKeyboard.c | 7 ++++++-
hw/darwin/darwinXinput.c | 4 ++++
hw/darwin/quartz/X11Application.m | 4 ++++
hw/darwin/quartz/X11Controller.m | 4 ++++
hw/darwin/quartz/applewm.c | 2 ++
hw/darwin/quartz/cr/XView.m | 1 +
hw/darwin/quartz/cr/crAppleWM.m | 1 +
hw/darwin/quartz/cr/crFrame.m | 1 +
hw/darwin/quartz/cr/crScreen.m | 1 +
hw/darwin/quartz/fullscreen/fullscreen.c | 1 +
hw/darwin/quartz/fullscreen/quartzCursor.c | 1 +
hw/darwin/quartz/pseudoramiX.c | 3 ++-
hw/darwin/quartz/quartz.c | 1 +
hw/darwin/quartz/quartzAudio.c | 1 +
hw/darwin/quartz/quartzCursor.c | 1 +
hw/darwin/quartz/quartzPasteboard.c | 1 +
hw/darwin/quartz/quartzStartup.c | 5 +++++
hw/darwin/quartz/xpr/appledri.c | 1 +
hw/darwin/quartz/xpr/dri.c | 2 --
22 files changed, 45 insertions(+), 8 deletions(-)
New commits:
commit a8e35ebf930103acdbae8fd09e7a58a134a511b1
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date: Thu Nov 29 00:41:57 2007 -0800
Darwin: Cleaned up includes
I cleaned up the #includes a bit to make sure all the source files properly included xorg-config.h
Only quartzStartup.c and darwinKeyboard.c do not include it. I ran into some weird crashes when they did which I'm looking into...
diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c
index ae7ef75..b944e81 100644
--- a/hw/darwin/darwin.c
+++ b/hw/darwin/darwin.c
@@ -29,7 +29,9 @@
* use or other dealings in this Software without prior written authorization.
*/
-#include <dix-config.h>
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h
index 846ed4c..468cb6e 100644
--- a/hw/darwin/darwin.h
+++ b/hw/darwin/darwin.h
@@ -27,9 +27,6 @@
#ifndef _DARWIN_H
#define _DARWIN_H
-//#include "dix-config.h" // This crashes us for some reason...
-#define SHAPE
-
#include <IOKit/IOTypes.h>
#include "inputstr.h"
#include "scrnintstr.h"
diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c
index 4201e0e..32941ad 100644
--- a/hw/darwin/darwinEvents.c
+++ b/hw/darwin/darwinEvents.c
@@ -30,6 +30,10 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xmd.h>
diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c
index e4de71a..a10b096 100644
--- a/hw/darwin/darwinKeyboard.c
+++ b/hw/darwin/darwinKeyboard.c
@@ -56,9 +56,14 @@
===========================================================================
*/
+// Including this crashes us... why?
+// #ifdef HAVE_XORG_CONFIG_H
+// #include <xorg-config.h>
+// #endif
+
// Define this to get a diagnostic output to stderr which is helpful
// in determining how the X server is interpreting the Darwin keymap.
-#define DUMP_DARWIN_KEYMAP
+// #define DUMP_DARWIN_KEYMAP
#include <stdio.h>
#include <stdlib.h>
diff --git a/hw/darwin/darwinXinput.c b/hw/darwin/darwinXinput.c
index 260d72a..e9e60d9 100644
--- a/hw/darwin/darwinXinput.c
+++ b/hw/darwin/darwinXinput.c
@@ -52,6 +52,10 @@ SOFTWARE.
********************************************************/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/hw/darwin/quartz/X11Application.m b/hw/darwin/quartz/X11Application.m
index cba65f0..6ed8abc 100644
--- a/hw/darwin/quartz/X11Application.m
+++ b/hw/darwin/quartz/X11Application.m
@@ -27,6 +27,10 @@
promote the sale, use or other dealings in this Software without
prior written authorization. */
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include "quartzCommon.h"
#import "X11Application.h"
diff --git a/hw/darwin/quartz/X11Controller.m b/hw/darwin/quartz/X11Controller.m
index 6929566..8c70875 100644
--- a/hw/darwin/quartz/X11Controller.m
+++ b/hw/darwin/quartz/X11Controller.m
@@ -27,6 +27,10 @@
promote the sale, use or other dealings in this Software without
prior written authorization. */
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#define DEFAULT_PATH "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/X11/bin"
#include "quartzCommon.h"
diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c
index 5c1c6c2..d30e017 100644
--- a/hw/darwin/quartz/applewm.c
+++ b/hw/darwin/quartz/applewm.c
@@ -24,9 +24,11 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
+
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "quartzCommon.h"
#define NEED_REPLIES
diff --git a/hw/darwin/quartz/cr/XView.m b/hw/darwin/quartz/cr/XView.m
index 488f88a..8cf53f7 100644
--- a/hw/darwin/quartz/cr/XView.m
+++ b/hw/darwin/quartz/cr/XView.m
@@ -33,6 +33,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#import "XView.h"
diff --git a/hw/darwin/quartz/cr/crAppleWM.m b/hw/darwin/quartz/cr/crAppleWM.m
index c3aa885..ab56a94 100644
--- a/hw/darwin/quartz/cr/crAppleWM.m
+++ b/hw/darwin/quartz/cr/crAppleWM.m
@@ -29,6 +29,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "quartz/quartzCommon.h"
#include "quartz/cr/cr.h"
diff --git a/hw/darwin/quartz/cr/crFrame.m b/hw/darwin/quartz/cr/crFrame.m
index 39ca211..3691586 100644
--- a/hw/darwin/quartz/cr/crFrame.m
+++ b/hw/darwin/quartz/cr/crFrame.m
@@ -30,6 +30,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "quartz/quartzCommon.h"
#include "quartz/cr/cr.h"
diff --git a/hw/darwin/quartz/cr/crScreen.m b/hw/darwin/quartz/cr/crScreen.m
index ce43305..0162b63 100644
--- a/hw/darwin/quartz/cr/crScreen.m
+++ b/hw/darwin/quartz/cr/crScreen.m
@@ -30,6 +30,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "quartz/quartzCommon.h"
#include "quartz/cr/cr.h"
diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c
index c4a80d2..f6b6786 100644
--- a/hw/darwin/quartz/fullscreen/fullscreen.c
+++ b/hw/darwin/quartz/fullscreen/fullscreen.c
@@ -29,6 +29,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "quartz/quartzCommon.h"
#include "darwin.h"
#include "quartz/quartz.h"
diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c
index 41767c1..9c3cc59 100644
--- a/hw/darwin/quartz/fullscreen/quartzCursor.c
+++ b/hw/darwin/quartz/fullscreen/quartzCursor.c
@@ -31,6 +31,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "quartz/quartzCommon.h"
#include "quartz/quartzCursor.h"
#include "darwin.h"
diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/darwin/quartz/pseudoramiX.c
index 5c5d342..d3f00ee 100644
--- a/hw/darwin/quartz/pseudoramiX.c
+++ b/hw/darwin/quartz/pseudoramiX.c
@@ -33,10 +33,11 @@ dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-#include "pseudoramiX.h"
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
+#include "pseudoramiX.h"
#include "extnsionst.h"
#include "dixstruct.h"
#include "window.h"
diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c
index d1eb724..8f32eeb 100644
--- a/hw/darwin/quartz/quartz.c
+++ b/hw/darwin/quartz/quartz.c
@@ -31,6 +31,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "quartzCommon.h"
#include "quartz.h"
#include "darwin.h"
diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/darwin/quartz/quartzAudio.c
index 1980cd2..2448af5 100644
--- a/hw/darwin/quartz/quartzAudio.c
+++ b/hw/darwin/quartz/quartzAudio.c
@@ -39,6 +39,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "quartzCommon.h"
#include "quartzAudio.h"
diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/darwin/quartz/quartzCursor.c
index a5483ee..0e8778e 100644
--- a/hw/darwin/quartz/quartzCursor.c
+++ b/hw/darwin/quartz/quartzCursor.c
@@ -31,6 +31,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "quartzCommon.h"
#include "quartzCursor.h"
#include "darwin.h"
diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/darwin/quartz/quartzPasteboard.c
index a3536fc..4adf91d 100644
--- a/hw/darwin/quartz/quartzPasteboard.c
+++ b/hw/darwin/quartz/quartzPasteboard.c
@@ -33,6 +33,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "quartzPasteboard.h"
#include <X11/Xatom.h>
diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/darwin/quartz/quartzStartup.c
index 6f45949..872b4fc 100644
--- a/hw/darwin/quartz/quartzStartup.c
+++ b/hw/darwin/quartz/quartzStartup.c
@@ -27,6 +27,11 @@
* use or other dealings in this Software without prior written authorization.
*/
+// Including this crashes us... why?
+// #ifdef HAVE_XORG_CONFIG_H
+// #include <xorg-config.h>
+// #endif
+
#include <fcntl.h>
#include <unistd.h>
#include <CoreFoundation/CoreFoundation.h>
diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c
index 7925239..f39fd0b 100644
--- a/hw/darwin/quartz/xpr/appledri.c
+++ b/hw/darwin/quartz/xpr/appledri.c
@@ -38,6 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#define NEED_REPLIES
#define NEED_EVENTS
#include <X11/X.h>
diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c
index 1047199..dfb5c72 100644
--- a/hw/darwin/quartz/xpr/dri.c
+++ b/hw/darwin/quartz/xpr/dri.c
@@ -34,8 +34,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-#include <dix-config.h>
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
More information about the xorg-commit
mailing list