Darwin: #ifdefs around dix-config.h include and NDEBUG/assert.h workaround.

(cherry picked from commit d2b768890f)
2007-11-29 02:19:22 -08:00 · 2007-11-29 02:19:22 -08:00 · 8a079be0dd
parent 3839756061
commit 8a079be0dd
31 changed files with 86 additions and 7 deletions
--- 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.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include <X11/X.h>
 #include <X11/Xproto.h>
--- 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"
--- a/hw/darwin/darwinKeyboard.c
+++ b/hw/darwin/darwinKeyboard.c
@ -56,9 +56,13 @@
 ===========================================================================
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-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>
@ -69,7 +73,15 @@
 #include <architecture/byte_order.h>  // For the NXSwap*
 #include "darwin.h"
 #include "darwinKeyboard.h"
+
+#ifdef NDEBUG
+#undef NDEBUG
 #include <assert.h>
+#define NDEBUG 1
+#else
+#include <assert.h>
+#endif
+
 #define AltMask         Mod1Mask
 #define MetaMask        Mod2Mask
 #define FunctionMask    Mod3Mask
--- a/hw/darwin/darwinXinput.c
+++ b/hw/darwin/darwinXinput.c
@ -52,6 +52,10 @@ SOFTWARE.

 ********************************************************/

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #define	 NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
--- 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_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "quartzCommon.h"

 #import "X11Application.h"
--- 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_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #define DEFAULT_PATH "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/X11/bin"

 #include "quartzCommon.h"
--- a/hw/darwin/quartz/applewm.c
+++ b/hw/darwin/quartz/applewm.c
@ -25,7 +25,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 **************************************************************************/

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "quartzCommon.h"

--- a/hw/darwin/quartz/cr/XView.m
+++ b/hw/darwin/quartz/cr/XView.m
@ -30,10 +30,13 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #import "XView.h"

+
@implementation XView

 - (BOOL)isFlipped
--- a/hw/darwin/quartz/cr/crAppleWM.m
+++ b/hw/darwin/quartz/cr/crAppleWM.m
@ -26,7 +26,9 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "quartz/quartzCommon.h"
 #include "quartz/cr/cr.h"
--- a/hw/darwin/quartz/cr/crFrame.m
+++ b/hw/darwin/quartz/cr/crFrame.m
@ -27,7 +27,9 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "quartz/quartzCommon.h"
 #include "quartz/cr/cr.h"
--- a/hw/darwin/quartz/cr/crScreen.m
+++ b/hw/darwin/quartz/cr/crScreen.m
@ -27,7 +27,9 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "quartz/quartzCommon.h"
 #include "quartz/cr/cr.h"
--- a/hw/darwin/quartz/fullscreen/fullscreen.c
+++ b/hw/darwin/quartz/fullscreen/fullscreen.c
@ -26,7 +26,9 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "quartz/quartzCommon.h"
 #include "darwin.h"
--- a/hw/darwin/quartz/fullscreen/quartzCursor.c
+++ b/hw/darwin/quartz/fullscreen/quartzCursor.c
@ -28,7 +28,9 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "quartz/quartzCommon.h"
 #include "quartz/quartzCursor.h"
--- 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_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

+#include "pseudoramiX.h"
 #include "extnsionst.h"
 #include "dixstruct.h"
 #include "window.h"
--- a/hw/darwin/quartz/quartz.c
+++ b/hw/darwin/quartz/quartz.c
@ -28,7 +28,9 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "quartzCommon.h"
 #include "quartz.h"
--- a/hw/darwin/quartz/quartzAudio.c
+++ b/hw/darwin/quartz/quartzAudio.c
@ -36,7 +36,9 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "quartzCommon.h"
 #include "quartzAudio.h"
--- a/hw/darwin/quartz/quartzCocoa.m
+++ b/hw/darwin/quartz/quartzCocoa.m
@ -32,7 +32,9 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "quartzCommon.h"

--- a/hw/darwin/quartz/quartzCursor.c
+++ b/hw/darwin/quartz/quartzCursor.c
@ -28,7 +28,9 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "quartzCommon.h"
 #include "quartzCursor.h"
--- a/hw/darwin/quartz/quartzKeyboard.c
+++ b/hw/darwin/quartz/quartzKeyboard.c
@ -31,7 +31,9 @@
   prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "quartzCommon.h"

--- a/hw/darwin/quartz/quartzPasteboard.c
+++ b/hw/darwin/quartz/quartzPasteboard.c
@ -30,7 +30,9 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "quartzPasteboard.h"

--- a/hw/darwin/quartz/quartzStartup.c
+++ b/hw/darwin/quartz/quartzStartup.c
@ -27,6 +27,10 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <fcntl.h>
 #include <unistd.h>
 #include <CoreFoundation/CoreFoundation.h>
@ -35,7 +39,14 @@
 #include "quartz.h"
 #include "opaque.h"
 #include "micmap.h"
+
+#ifdef NDEBUG
+#undef NDEBUG
 #include <assert.h>
+#define NDEBUG 1
+#else
+#include <assert.h>
+#endif

 char **envpGlobal;      // argcGlobal and argvGlobal
                        // are from dix/globals.c
--- a/hw/darwin/quartz/xpr/Makefile.am
+++ b/hw/darwin/quartz/xpr/Makefile.am
@ -1,7 +1,6 @@
 noinst_LIBRARIES = libxpr.a
 AM_CFLAGS =  $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
-	   -DHAVE_XORG_CONFIG_H \
 	   -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
 	   -I$(top_srcdir)/miext \
 	   -I$(top_srcdir)/miext/rootless \
--- a/hw/darwin/quartz/xpr/appledri.c
+++ b/hw/darwin/quartz/xpr/appledri.c
@ -35,7 +35,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #define NEED_REPLIES
 #define NEED_EVENTS
--- a/hw/darwin/quartz/xpr/dri.c
+++ b/hw/darwin/quartz/xpr/dri.c
@ -34,7 +34,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #ifdef XFree86LOADER
 #include "xf86.h"
--- a/hw/darwin/quartz/xpr/x-hash.c
+++ b/hw/darwin/quartz/xpr/x-hash.c
@ -27,7 +27,9 @@
   promote the sale, use or other dealings in this Software without
   prior written authorization. */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "x-hash.h"
 #include "x-list.h"
--- a/hw/darwin/quartz/xpr/x-hook.c
+++ b/hw/darwin/quartz/xpr/x-hook.c
@ -27,7 +27,9 @@
   promote the sale, use or other dealings in this Software without
   prior written authorization. */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "x-hook.h"
 #include <stdlib.h>
--- a/hw/darwin/quartz/xpr/x-list.c
+++ b/hw/darwin/quartz/xpr/x-list.c
@ -27,7 +27,9 @@
   promote the sale, use or other dealings in this Software without
   prior written authorization. */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "x-list.h"
 #include <stdlib.h>
--- a/hw/darwin/quartz/xpr/xprAppleWM.c
+++ b/hw/darwin/quartz/xpr/xprAppleWM.c
@ -27,7 +27,9 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "xpr.h"
 #include "quartz/applewmExt.h"
--- a/hw/darwin/quartz/xpr/xprCursor.c
+++ b/hw/darwin/quartz/xpr/xprCursor.c
@ -29,7 +29,9 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "quartz/quartzCommon.h"
 #include "xpr.h"
--- a/hw/darwin/quartz/xpr/xprFrame.c
+++ b/hw/darwin/quartz/xpr/xprFrame.c
@ -27,7 +27,9 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "xpr.h"
 #include "rootlessCommon.h"
--- a/hw/darwin/quartz/xpr/xprScreen.c
+++ b/hw/darwin/quartz/xpr/xprScreen.c
@ -27,7 +27,9 @@
 * use or other dealings in this Software without prior written authorization.
 */

+#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#endif

 #include "quartz/quartzCommon.h"
 #include "quartz/quartz.h"