aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xext/security.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-20 10:31:24 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-20 10:31:24 +0200
commit61b8d44f1f76df5abb9e53427f07e9f1ad987e32 (patch)
treef0f84ebfb28ec44254def01211eeca94c76aeed4 /nx-X11/programs/Xserver/Xext/security.c
parentda01dc8da1aedb1f75d62c03748a239c54b14483 (diff)
parent50eb5e4a9bf812895a7d5c4e6ae0775c6910931f (diff)
downloadnx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.tar.gz
nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.tar.bz2
nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.zip
Merge branch 'uli42-pr/fix_compile_warnings' into 3.6.x
Attributes GH PR #230: https://github.com/ArcticaProject/nx-libs/pull/230
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/security.c')
-rw-r--r--nx-X11/programs/Xserver/Xext/security.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c
index 1071565f3..c1b7b50a9 100644
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
@@ -148,7 +148,7 @@ int (*SwappedUntrustedProcVector[256])(
* try a set of well known paths.
*/
-const char *_NXGetPolicyFilePath(const char *path)
+char *_NXGetPolicyFilePath(const char *path)
{
struct stat SecurityPolicyStat;
@@ -1345,7 +1345,6 @@ SecurityCensorImage(client, pVisibleRegion, widthBytesLine, pDraw, x, y, w, h,
unsigned int format;
char * pBuf;
{
- ScreenPtr pScreen = pDraw->pScreen;
RegionRec imageRegion; /* region representing x,y,w,h */
RegionRec censorRegion; /* region to obliterate */
BoxRec imageBox;