PolicyKit: Branch 'master'

[David Zeuthen]

 polkit/polkit-memory.h |    4 ++--
 polkit/polkit.h        |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ef211df94cae5e1f12364267d891509792374ba7
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Nov 5 13:41:03 2007 -0500

    export memory mangement and hash table functions

diff --git a/polkit/polkit-memory.h b/polkit/polkit-memory.h
index f2385a9..d7880ea 100644
--- a/polkit/polkit-memory.h
+++ b/polkit/polkit-memory.h
@@ -23,8 +23,8 @@
  *
  **************************************************************************/
 
-#if !defined (POLKIT_COMPILATION)
-#error "polkit-memory.h is a private file"
+#if !defined (POLKIT_COMPILATION) && !defined(_POLKIT_INSIDE_POLKIT_H)
+#error "Only <polkit/polkit.h> can be included directly, this file may disappear or change contents."
 #endif
 
 #ifndef POLKIT_MEMORY_H
diff --git a/polkit/polkit.h b/polkit/polkit.h
index 0a929a5..0836d4c 100644
--- a/polkit/polkit.h
+++ b/polkit/polkit.h
@@ -28,6 +28,8 @@
 
 #define _POLKIT_INSIDE_POLKIT_H 1
 #include <polkit/polkit-types.h>
+#include <polkit/polkit-memory.h>
+#include <polkit/polkit-hash.h>
 #include <polkit/polkit-sysdeps.h>
 #include <polkit/polkit-error.h>
 #include <polkit/polkit-result.h>