diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-04-17 12:10:22 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-04-17 12:10:22 -0400 |
| commit | 1f06d32ef58749d0f0c062193d237ee98f60e90f (patch) | |
| tree | 6130443e4804582e79b5000949bfdd186da44ed1 /dix/resource.c | |
| parent | cf962a849db2b259ca558c6265ea7e3328a4d312 (diff) | |
| parent | fc162c6cfa06f0b012743d6d79cef45cf0166229 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/privates.c
Diffstat (limited to 'dix/resource.c')
| -rw-r--r-- | dix/resource.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/resource.c b/dix/resource.c index 7530e8665..e1bb74f64 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -246,7 +246,7 @@ CreateNewResourceType(DeleteType deleteFunc) } _X_EXPORT RESTYPE -CreateNewResourceClass() +CreateNewResourceClass(void) { RESTYPE next = lastResourceClass >> 1; @@ -868,7 +868,7 @@ FreeClientResources(ClientPtr client) } void -FreeAllResources() +FreeAllResources(void) { int i; |