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 +#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 #include #endif