Make support for the FBIOGET ioctls conditional on linux/fb.h being

present at compile time.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2382
This commit is contained in:
Tom Hughes 2004-04-22 07:28:43 +00:00
parent e14c5dc6ed
commit a159f627cb
3 changed files with 7 additions and 1 deletions

View File

@ -331,7 +331,7 @@ AC_SUBST(PREFERRED_STACK_BOUNDARY)
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/socket.h sys/statfs.h sys/time.h sys/endian.h endian.h termios.h unistd.h utime.h])
AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/socket.h sys/statfs.h sys/time.h sys/endian.h endian.h termios.h unistd.h utime.h linux/fb.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_UID_T

View File

@ -3231,6 +3231,7 @@ PRE(ioctl)
case CDROM_CLEAR_OPTIONS: /* 0x5321 */
break;
#ifdef HAVE_LINUX_FB_H
case FBIOGET_VSCREENINFO: /* 0x4600 */
SYSCALL_TRACK( pre_mem_write,tid,
"ioctl(FBIOGET_VSCREENINFO)", arg3,
@ -3241,6 +3242,7 @@ PRE(ioctl)
"ioctl(FBIOGET_FSCREENINFO)", arg3,
sizeof(struct fb_fix_screeninfo));
break;
#endif
/* We don't have any specific information on it, so
try to do something reasonable based on direction and
@ -3595,6 +3597,7 @@ POST(ioctl)
case CDROM_CLEAR_OPTIONS: /* 0x5321 */
break;
#ifdef HAVE_LINUX_FB_H
case FBIOGET_VSCREENINFO: //0x4600
if (res == 0)
VG_TRACK( post_mem_write,arg3, sizeof(struct fb_var_screeninfo));
@ -3603,6 +3606,7 @@ POST(ioctl)
if (res == 0)
VG_TRACK( post_mem_write,arg3, sizeof(struct fb_fix_screeninfo));
break;
#endif
/* We don't have any specific information on it, so
try to do something reasonable based on direction and

View File

@ -63,7 +63,9 @@
#include <linux/cdrom.h> /* for cd-rom ioctls */
#include <signal.h> /* for siginfo_t */
#include <linux/timex.h> /* for adjtimex */
#ifdef HAVE_LINUX_FB_H
#include <linux/fb.h> /* for fb_* structs */
#endif
#define __USE_LARGEFILE64
#include <sys/stat.h> /* for struct stat */