autoconf'd <errno.h> handling and removed an unused '#include <sys/stat.h>'
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@553 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
3817d97ab7
commit
a954e5c33e
@ -886,3 +886,5 @@ default.
|
|||||||
***************************************************************************
|
***************************************************************************
|
||||||
|
|
||||||
(230) Removed acconfig.h, it is deprecated and we don't need it.
|
(230) Removed acconfig.h, it is deprecated and we don't need it.
|
||||||
|
|
||||||
|
(231) Cleaned up and autoconf'd the header inclusion story a bit.
|
||||||
|
@ -23,7 +23,7 @@ AC_SUBST([LIBXXF86VM])
|
|||||||
|
|
||||||
# Checks for header files.
|
# Checks for header files.
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glx.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h])
|
AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glx.h errno.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h])
|
||||||
AC_HEADER_TIME
|
AC_HEADER_TIME
|
||||||
|
|
||||||
save_CFLAGS="$CFLAGS"
|
save_CFLAGS="$CFLAGS"
|
||||||
|
@ -73,6 +73,9 @@
|
|||||||
# if HAVE_FCNTL_H
|
# if HAVE_FCNTL_H
|
||||||
# include <fcntl.h>
|
# include <fcntl.h>
|
||||||
# endif
|
# endif
|
||||||
|
# if HAVE_ERRNO_H
|
||||||
|
# include <errno.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
|
||||||
@ -93,8 +96,6 @@
|
|||||||
# define JS_RETURN (sizeof(struct JS_DATA_TYPE))
|
# define JS_RETURN (sizeof(struct JS_DATA_TYPE))
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# include <errno.h>
|
|
||||||
|
|
||||||
# if defined(__linux__)
|
# if defined(__linux__)
|
||||||
# include <linux/joystick.h>
|
# include <linux/joystick.h>
|
||||||
|
|
||||||
|
@ -27,12 +27,11 @@
|
|||||||
|
|
||||||
#include <GL/freeglut.h>
|
#include <GL/freeglut.h>
|
||||||
#include "freeglut_internal.h"
|
#include "freeglut_internal.h"
|
||||||
|
#if HAVE_ERRNO_H
|
||||||
|
# include <errno.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#if TARGET_HOST_UNIX_X11
|
#if TARGET_HOST_WINCE
|
||||||
#include <errno.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#elif TARGET_HOST_WIN32
|
|
||||||
#elif TARGET_HOST_WINCE
|
|
||||||
|
|
||||||
typedef struct GXDisplayProperties GXDisplayProperties;
|
typedef struct GXDisplayProperties GXDisplayProperties;
|
||||||
typedef struct GXKeyList GXKeyList;
|
typedef struct GXKeyList GXKeyList;
|
||||||
|
Reference in New Issue
Block a user