xserver: Branch 'XACE-SELINUX'

[Eamon Walsh]

 dix/privates.c     |    2 +-
 include/privates.h |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 860a09cfb8afc0a293c7eb5e01762724eb86847a (from 6fd0a0b08de912421718aca17fe34a55ae285ae7)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Thu Aug 16 16:10:44 2007 -0400

    devPrivates rework: Nevermind, can't const due to return value warnings.
    
    This reverts commit 6fd0a0b08de912421718aca17fe34a55ae285ae7.

diff --git a/dix/privates.c b/dix/privates.c
index 1ca361c..4dbba43 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -47,7 +47,7 @@ from The Open Group.
 #include "extnsionst.h"
 
 typedef struct _PrivateDesc {
-    pointer key;
+    DevPrivateKey key;
     unsigned size;
     CallbackListPtr initfuncs;
     CallbackListPtr deletefuncs;
diff --git a/include/privates.h b/include/privates.h
index e81e40a..e377b30 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -19,10 +19,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
  * STUFF FOR PRIVATES
  *****************************************************************/
 
-typedef void *const DevPrivateKey;
+typedef void *DevPrivateKey;
 
 typedef struct _Private {
-    pointer		key;
+    DevPrivateKey	key;
     pointer		value;
     struct _Private	*next;
 } PrivateRec;
@@ -111,7 +111,7 @@ dixSetPrivate(PrivateRec **privates, con
  * The calldata argument to the callbacks is a PrivateCallbackPtr.
  */
 typedef struct _PrivateCallback {
-    pointer key;	/* key used to set the private */
+    DevPrivateKey key;	/* private registration key */
     pointer *value;	/* address of private pointer */
 } PrivateCallbackRec;