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