summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-12-14 10:12:10 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-12-14 10:12:10 -0800
commit0ac79f0132dfd268bc6e9ff2dcdea55e00b65a92 (patch)
treea284a74aac91ece5ca45f365488da7ad66d3f90c
parent4dd267a98790f4404b7607d9362d4346f55f49fb (diff)
Rename local err variable in XW_RSYM macro to avoid shadow warnings
Clears many warnings of the form: XvMCWrapper.c: In function 'initW': XvMCWrapper.c:362:5: warning: declaration of 'err' shadows a previous local [-Wshadow] XvMCWrapper.c:267:11: warning: shadowed declaration is here [-Wshadow] due to variable declared in macro block sharing "err" name with a variable declared in the function calling the macro. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--wrapper/XvMCWrapper.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/wrapper/XvMCWrapper.c b/wrapper/XvMCWrapper.c
index bff5a8b..9bdf033 100644
--- a/wrapper/XvMCWrapper.c
+++ b/wrapper/XvMCWrapper.c
@@ -178,15 +178,15 @@ static void *handle2;
#define XW_RSYM(base,handle,handle2,pointer, retval) \
do { \
- register char *err; \
+ register char *symerr; \
base.pointer = (pointer##P) dlsym((handle),#pointer); \
- if ((err = dlerror()) != NULL) { \
+ if ((symerr = dlerror()) != NULL) { \
if (!handle2) { \
- fprintf(stderr,"%s\n",err); return retval; \
+ fprintf(stderr,"%s\n",symerr); return retval; \
} \
base.pointer = (pointer##P) dlsym((handle2),#pointer); \
- if ((err = dlerror()) != NULL) { \
- fprintf(stderr,"%s\n",err); return retval; \
+ if ((symerr = dlerror()) != NULL) { \
+ fprintf(stderr,"%s\n",symerr); return retval; \
} \
} \
} while (0);