From d521615f3d2c3578740f25ebddc2b013e60f66ba Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 13 Feb 2013 15:16:51 +0000
Subject: [PATCH] fix missing symbol when trying to compile with both
 HAVE_CARBON and HAVE_COCOA

---
 panda/metalibs/pandagl/pandagl.cxx | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/panda/metalibs/pandagl/pandagl.cxx b/panda/metalibs/pandagl/pandagl.cxx
index 33c9a1d35d..5a17201827 100644
--- a/panda/metalibs/pandagl/pandagl.cxx
+++ b/panda/metalibs/pandagl/pandagl.cxx
@@ -12,12 +12,10 @@
 #include "wglGraphicsPipe.h"
 #endif
 
-#ifdef HAVE_COCOA
+#if defined(HAVE_COCOA)
 #include "config_cocoadisplay.h"
 #include "cocoaGraphicsPipe.h"
-#endif
-
-#ifdef HAVE_CARBON
+#elif defined(HAVE_CARBON)
 #include "config_osxdisplay.h"
 #include "osxGraphicsPipe.h"
 #endif
@@ -53,11 +51,9 @@ init_libpandagl() {
   init_libwgldisplay();
 #endif  // HAVE_GL
 
-#ifdef HAVE_COCOA
+#if defined(HAVE_COCOA)
   init_libcocoadisplay();
-#endif
-
-#ifdef HAVE_CARBON
+#elif defined(HAVE_CARBON)
   init_libosxdisplay();
 #endif