diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-12-14 10:49:21 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-14 10:49:21 +0100 |
| commit | 1d301c517e613dbb7e14e8b5fe5552919366fc4e (patch) | |
| tree | fbcc0812cafcd14eb4512bb66b751314736671fc /nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c | |
| parent | 91ca51bffc299519f723cc3adeb207bbad8a26c3 (diff) | |
| parent | 8bb1579f40bb74b9dad302e79c124541694b3265 (diff) | |
| download | nx-libs-1d301c517e613dbb7e14e8b5fe5552919366fc4e.tar.gz nx-libs-1d301c517e613dbb7e14e8b5fe5552919366fc4e.tar.bz2 nx-libs-1d301c517e613dbb7e14e8b5fe5552919366fc4e.zip | |
Merge branch 'sunweaver-pr/fix-compiler-warnings' into 3.6.x
Attributes GH PR #333: https://github.com/ArcticaProject/nx-libs/pull/333
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c b/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c index ee19c28d0..ea617aa4b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c @@ -95,16 +95,20 @@ ProcXvDispatch(ClientPtr client) result = (XineramaXvPutVideo(client)); else #endif - result = (ProcXvPutVideo(client)); - break; + { + result = (ProcXvPutVideo(client)); + } + break; case xv_PutStill: #ifdef PANORAMIX if(!noPanoramiXExtension) result = (XineramaXvPutStill(client)); else #endif - result = (ProcXvPutStill(client)); - break; + { + result = (ProcXvPutStill(client)); + } + break; case xv_GetVideo: result = (ProcXvGetVideo(client)); break; case xv_GetStill: result = (ProcXvGetStill(client)); break; case xv_GrabPort: result = (ProcXvGrabPort(client)); break; @@ -117,16 +121,20 @@ ProcXvDispatch(ClientPtr client) result = (XineramaXvStopVideo(client)); else #endif + { result = (ProcXvStopVideo(client)); - break; + } + break; case xv_SetPortAttribute: #ifdef PANORAMIX if(!noPanoramiXExtension) result = (XineramaXvSetPortAttribute(client)); else #endif + { result = (ProcXvSetPortAttribute(client)); - break; + } + break; case xv_GetPortAttribute: result = (ProcXvGetPortAttribute(client)); break; case xv_QueryBestSize: result = (ProcXvQueryBestSize(client)); break; case xv_QueryPortAttributes: result = (ProcXvQueryPortAttributes(client)); break; @@ -136,8 +144,10 @@ ProcXvDispatch(ClientPtr client) result = (XineramaXvPutImage(client)); else #endif + { result = (ProcXvPutImage(client)); - break; + } + break; #ifdef MITSHM case xv_ShmPutImage: #ifdef PANORAMIX @@ -145,8 +155,10 @@ ProcXvDispatch(ClientPtr client) result = (XineramaXvShmPutImage(client)); else #endif + { result = (ProcXvShmPutImage(client)); - break; + } + break; #endif case xv_QueryImageAttributes: result = (ProcXvQueryImageAttributes(client)); break; case xv_ListImageFormats: result = (ProcXvListImageFormats(client)); break; |