From 7042dd6c69287ada7b7155e3ded19d298fabd5f6 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 16 Dec 2009 20:21:10 +0000
Subject: [PATCH] build error

---
 direct/src/showbase/showBase_assist.mm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/direct/src/showbase/showBase_assist.mm b/direct/src/showbase/showBase_assist.mm
index 2eb8c0c3bc..33598fca2c 100644
--- a/direct/src/showbase/showBase_assist.mm
+++ b/direct/src/showbase/showBase_assist.mm
@@ -1,9 +1,11 @@
 #ifndef CPPPARSER
-#include "showBase.h"
+#include "directbase.h"
 
 #ifdef IS_OSX
 
+// We have to include AppKit before showBase.h to avoid a namespace collision.
 #include <AppKit/AppKit.h>
+#include "showBase.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: activate_osx_application