From 2d66cdc3bae30d5c480625e8f965ced423ceb9c7 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Sun, 25 Aug 2013 17:12:00 +0000
Subject: [PATCH] compile fixes

---
 panda/src/rocket/config_rocket.cxx  | 3 +++
 panda/src/rocket/rocketRegion_ext.I | 1 +
 2 files changed, 4 insertions(+)

diff --git a/panda/src/rocket/config_rocket.cxx b/panda/src/rocket/config_rocket.cxx
index 985c41df30..064f354c63 100644
--- a/panda/src/rocket/config_rocket.cxx
+++ b/panda/src/rocket/config_rocket.cxx
@@ -21,7 +21,10 @@
 #include "pandaSystem.h"
 #include "dconfig.h"
 
+// This is defined by both Panda and Rocket.
+#define Factory RocketFactory
 #include <Rocket/Core.h>
+#undef Factory
 
 Configure(config_rocket);
 NotifyCategoryDef(rocket, "");
diff --git a/panda/src/rocket/rocketRegion_ext.I b/panda/src/rocket/rocketRegion_ext.I
index 4c6f9a46d0..d3f29b5ec5 100644
--- a/panda/src/rocket/rocketRegion_ext.I
+++ b/panda/src/rocket/rocketRegion_ext.I
@@ -16,6 +16,7 @@
 
 #ifndef CPPPARSER
 #undef this
+#define HAVE_LONG_LONG 1
 #include <Rocket/Core/Context.h>
 #include <Rocket/Core/Python/Utilities.h>
 #endif