From 588abfd54eb267dd79fe441e42aee9fc7534eb6e Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 20 Apr 2012 17:39:44 +0200 Subject: Solved compilation errors and warnings due to latest commit --- xorg-server/dix/resource.c | 60 +++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'xorg-server/dix') diff --git a/xorg-server/dix/resource.c b/xorg-server/dix/resource.c index 1ab06d51d..c04b5578e 100644 --- a/xorg-server/dix/resource.c +++ b/xorg-server/dix/resource.c @@ -432,65 +432,65 @@ FindGCSubRes(pointer value, FindAllRes func, pointer cdata) static struct ResourceType *resourceTypes; static const struct ResourceType predefTypes[] = { - /* [RT_NONE & (RC_LASTPREDEF - 1)] = */ { - /*.deleteFunc = */(DeleteType)NoopDDA, + /* [RT_NONE & (RC_LASTPREDEF - 1)] = */ { + /*.deleteFunc = */(DeleteType)NoopDDA, /*.sizeFunc = */GetDefaultBytes, /*.findSubResFunc = */DefaultFindSubRes, - /*.errorValue = */BadValue, + /*.errorValue = */BadValue, }, - /* [RT_WINDOW & (RC_LASTPREDEF - 1)] = */ { - /*.deleteFunc = */DeleteWindow, + /* [RT_WINDOW & (RC_LASTPREDEF - 1)] = */ { + /*.deleteFunc = */DeleteWindow, /*.sizeFunc = */GetWindowBytes, /*.findSubResFunc = */FindWindowSubRes, - /*.errorValue = */BadWindow, + /*.errorValue = */BadWindow, }, - /* [RT_PIXMAP & (RC_LASTPREDEF - 1)] = */ { - /*.deleteFunc = */dixDestroyPixmap, + /* [RT_PIXMAP & (RC_LASTPREDEF - 1)] = */ { + /*.deleteFunc = */dixDestroyPixmap, /*.sizeFunc = */GetPixmapBytes, /*.findSubResFunc = */DefaultFindSubRes, - /*.errorValue = */BadPixmap, + /*.errorValue = */BadPixmap, }, - /* [RT_GC & (RC_LASTPREDEF - 1)] = */ { - /*.deleteFunc = */FreeGC, + /* [RT_GC & (RC_LASTPREDEF - 1)] = */ { + /*.deleteFunc = */FreeGC, /*.sizeFunc = */GetGcBytes, /*.findSubResFunc = */FindGCSubRes, - /*.errorValue = */BadGC, + /*.errorValue = */BadGC, }, - /* [RT_FONT & (RC_LASTPREDEF - 1)] = */ { - /*.deleteFunc = */CloseFont, + /* [RT_FONT & (RC_LASTPREDEF - 1)] = */ { + /*.deleteFunc = */CloseFont, /*.sizeFunc = */GetDefaultBytes, /*.findSubResFunc = */DefaultFindSubRes, - /*.errorValue = */BadFont, + /*.errorValue = */BadFont, }, - /* [RT_CURSOR & (RC_LASTPREDEF - 1)] = */ { - /*.deleteFunc = */FreeCursor, + /* [RT_CURSOR & (RC_LASTPREDEF - 1)] = */ { + /*.deleteFunc = */FreeCursor, /*.sizeFunc = */GetDefaultBytes, /*.findSubResFunc = */DefaultFindSubRes, - /*.errorValue = */BadCursor, + /*.errorValue = */BadCursor, }, - /* [RT_COLORMAP & (RC_LASTPREDEF - 1)] = */ { - /*.deleteFunc = */FreeColormap, + /* [RT_COLORMAP & (RC_LASTPREDEF - 1)] = */ { + /*.deleteFunc = */FreeColormap, /*.sizeFunc = */GetDefaultBytes, /*.findSubResFunc = */DefaultFindSubRes, - /*.errorValue = */BadColor, + /*.errorValue = */BadColor, }, - /* [RT_CMAPENTRY & (RC_LASTPREDEF - 1)] = */ { - /*.deleteFunc = */FreeClientPixels, + /* [RT_CMAPENTRY & (RC_LASTPREDEF - 1)] = */ { + /*.deleteFunc = */FreeClientPixels, /*.sizeFunc = */GetDefaultBytes, /*.findSubResFunc = */DefaultFindSubRes, - /*.errorValue = */BadColor, + /*.errorValue = */BadColor, }, - /* [RT_OTHERCLIENT & (RC_LASTPREDEF - 1)] = */ { - /*.deleteFunc = */OtherClientGone, + /* [RT_OTHERCLIENT & (RC_LASTPREDEF - 1)] = */ { + /*.deleteFunc = */OtherClientGone, /*.sizeFunc = */GetDefaultBytes, /*.findSubResFunc = */DefaultFindSubRes, - /*.errorValue = */BadValue, + /*.errorValue = */BadValue, }, - /* [RT_PASSIVEGRAB & (RC_LASTPREDEF - 1)] = */ { - /*.deleteFunc = */DeletePassiveGrab, + /* [RT_PASSIVEGRAB & (RC_LASTPREDEF - 1)] = */ { /*.deleteFunc = */DeletePassiveGrab, /*.sizeFunc = */GetDefaultBytes, - /*.errorValue = */BadValue, + /*.findSubResFunc = */DefaultFindSubRes, + /*.errorValue = */BadValue, }, }; -- cgit v1.2.3