FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autoconf'd <fcntl.h> and <sys/ioctl.h> handling

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@550 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
spanne 2005-01-03 10:57:58 +00:00
parent 45a783693d
commit c6d8295732
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freeglut/freeglut/configure.ac
View File

@ -23,7 +23,7 @@ AC_SUBST([LIBXXF86VM])
# Checks for header files. # Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
AC_CHECK_HEADERS([sys/time.h GL/gl.h GL/glu.h GL/glx.h]) AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glx.h fcntl.h sys/ioctl.h sys/time.h])
AC_HEADER_TIME AC_HEADER_TIME
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
@ -32,6 +32,7 @@ AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], [], [], [#include <X11/Xlib.h>])
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"
# Checks for library functions. # Checks for library functions.
AC_PROG_GCC_TRADITIONAL
AC_CHECK_LIBM AC_CHECK_LIBM
AC_SUBST([LIBM]) AC_SUBST([LIBM])

9
freeglut/freeglut/src/freeglut_joystick.c
View File

@ -68,11 +68,16 @@
#if TARGET_HOST_UNIX_X11 #if TARGET_HOST_UNIX_X11
# define _JS_MAX_AXES 16 # define _JS_MAX_AXES 16
# if HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
# endif
# if HAVE_FCNTL_H
# include <fcntl.h>
# endif
# if defined(__FreeBSD__) || defined(__NetBSD__) # if defined(__FreeBSD__) || defined(__NetBSD__)
/* XXX The below hack is done until freeglut's autoconf is updated. */ /* XXX The below hack is done until freeglut's autoconf is updated. */
# define HAVE_USB_JS 1 # define HAVE_USB_JS 1
# include <sys/ioctl.h>
# if defined(__FreeBSD__) && __FreeBSD_version >= 500000 # if defined(__FreeBSD__) && __FreeBSD_version >= 500000
# include <sys/joystick.h> # include <sys/joystick.h>
# else # else
@ -89,11 +94,9 @@
# define JS_RETURN (sizeof(struct JS_DATA_TYPE)) # define JS_RETURN (sizeof(struct JS_DATA_TYPE))
# endif # endif
# include <fcntl.h>
# include <errno.h> # include <errno.h>
# if defined(__linux__) # if defined(__linux__)
# include <sys/ioctl.h>
# include <linux/joystick.h> # include <linux/joystick.h>
/* check the joystick driver version */ /* check the joystick driver version */