diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-08-16 16:10:44 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-08-16 16:12:01 -0400 |
| commit | 860a09cfb8afc0a293c7eb5e01762724eb86847a (patch) | |
| tree | 31294b12f428d9bc97dff0b6931c5cea6f9d7533 | |
| parent | 6fd0a0b08de912421718aca17fe34a55ae285ae7 (diff) | |
devPrivates rework: Nevermind, can't const due to return value warnings.
This reverts commit 6fd0a0b08de912421718aca17fe34a55ae285ae7.
| -rw-r--r-- | dix/privates.c | 2 | ||||
| -rw-r--r-- | include/privates.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dix/privates.c b/dix/privates.c index 1ca361c3d..4dbba437c 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 e81e40a93..e377b3068 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 *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, const DevPrivateKey key, pointer val) * 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; |