From 7c2822515b2e2251501fb272e18192d1bb05b853 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Mon, 6 Jul 2015 14:19:46 +0200
Subject: [PATCH] Remove dependency on X11/Intrinsic.h

---
 panda/src/display/get_x11.h                | 1 -
 panda/src/x11display/x11GraphicsWindow.cxx | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/panda/src/display/get_x11.h b/panda/src/display/get_x11.h
index 7ea150a963..edb9bbf5b7 100644
--- a/panda/src/display/get_x11.h
+++ b/panda/src/display/get_x11.h
@@ -52,7 +52,6 @@ struct XVisualInfo;
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
-#include <X11/Intrinsic.h>
 
 #ifdef HAVE_XRANDR
 #include <X11/extensions/Xrandr.h>
diff --git a/panda/src/x11display/x11GraphicsWindow.cxx b/panda/src/x11display/x11GraphicsWindow.cxx
index 5e4e7ee88c..785ab51ff0 100644
--- a/panda/src/x11display/x11GraphicsWindow.cxx
+++ b/panda/src/x11display/x11GraphicsWindow.cxx
@@ -1180,7 +1180,7 @@ set_wm_properties(const WindowProperties &properties, bool already_mapped) {
   nassertv(next_set_data < max_set_data);
 
   // Add the process ID as a convenience for other applications.
-  Cardinal pid = getpid();
+  PN_int32 pid = getpid();
   XChangeProperty(_display, _xwindow, x11_pipe->_net_wm_pid,
                   XA_CARDINAL, 32, PropModeReplace,
                   (unsigned char *)&pid, 1);