From f4bf740362fb96c8b33e48e008084c91ef20f86e Mon Sep 17 00:00:00 2001
From: kestred <kestred@riotcave.com>
Date: Sun, 19 Jan 2014 17:33:19 -0700
Subject: [PATCH] Fix HAVE_LOCKF in dtoolbase.h for python headers that don't
 define it.

---
 dtool/src/dtoolbase/dtoolbase.h | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/dtool/src/dtoolbase/dtoolbase.h b/dtool/src/dtoolbase/dtoolbase.h
index cb130def3c..e9d6a09da9 100644
--- a/dtool/src/dtoolbase/dtoolbase.h
+++ b/dtool/src/dtoolbase/dtoolbase.h
@@ -104,10 +104,21 @@
 #endif
 
 #ifdef HAVE_PYTHON
-#undef _POSIX_C_SOURCE
-#undef _XOPEN_SOURCE
-#undef HAVE_LOCKF
-#include "pyconfig.h"
+#  undef _POSIX_C_SOURCE
+#  undef _XOPEN_SOURCE
+// Some versions of python also define HAVE_LOCKF
+#  ifdef HAVE_LOCKF
+#    define PANDA_HAVE_LOCKF
+#    undef HAVE_LOCKF
+#  endif
+#  include "pyconfig.h"
+// Restore our HAVE_LOCKF if python didn't define it
+#  ifdef PANDA_HAVE_LOCKF
+#    undef PANDA_HAVE_LOCKF
+#    ifndef HAVE_LOCKF
+#      define HAVE_LOCKF 1
+#    endif
+#  endif
 #endif
 
 #ifndef HAVE_EIGEN