fix Wshadow compil

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@769 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: e9daa350d1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-09-14 (Tue, 14 Sep 2010)

Origin message was:
------------------
 fix Wshadow compil

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@769 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2010-09-14 16:08:54 +00:00
parent 9095499afe
commit d05090dbdd
4 changed files with 25 additions and 26 deletions

View File

@@ -479,14 +479,14 @@ int CFrameBuffer::setMode(unsigned int /*nxRes*/, unsigned int /*nyRes*/, unsign
xRes = screeninfo.xres;
yRes = screeninfo.yres;
bpp = screeninfo.bits_per_pixel;
fb_fix_screeninfo fix;
fb_fix_screeninfo _fix;
if (ioctl(fd, FBIOGET_FSCREENINFO, &fix)<0) {
if (ioctl(fd, FBIOGET_FSCREENINFO, &_fix)<0) {
perror("FBIOGET_FSCREENINFO");
return -1;
}
stride = fix.line_length;
stride = _fix.line_length;
printf("FB: %dx%dx%d line length %d. %s nevis GXA accelerator.\n", xRes, yRes, bpp, stride,
#ifdef USE_NEVIS_GXA
"Using"