Fixed <sys/time.h> / <time.h> handling as suggested by the autoconf
docs. git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@548 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
561481f9d2
commit
11192577c4
@ -23,7 +23,8 @@ 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])
|
AC_CHECK_HEADERS([sys/time.h GL/gl.h GL/glu.h GL/glx.h])
|
||||||
|
AC_HEADER_TIME
|
||||||
|
|
||||||
save_CFLAGS="$CFLAGS"
|
save_CFLAGS="$CFLAGS"
|
||||||
CFLAGS="$CFLAGS $X_CFLAGS"
|
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||||
|
@ -31,7 +31,6 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <time.h>
|
|
||||||
#include <GL/freeglut.h>
|
#include <GL/freeglut.h>
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
/* DUMP MEMORY LEAKS */
|
/* DUMP MEMORY LEAKS */
|
||||||
|
@ -76,7 +76,16 @@
|
|||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#if TARGET_HOST_UNIX_X11
|
#if TARGET_HOST_UNIX_X11
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/time.h>
|
# if TIME_WITH_SYS_TIME
|
||||||
|
# include <sys/time.h>
|
||||||
|
# include <time.h>
|
||||||
|
# else
|
||||||
|
# if HAVE_SYS_TIME_H
|
||||||
|
# include <sys/time.h>
|
||||||
|
# else
|
||||||
|
# include <time.h>
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* The system-dependant include files should go here: */
|
/* The system-dependant include files should go here: */
|
||||||
|
@ -31,7 +31,6 @@
|
|||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#if TARGET_HOST_UNIX_X11
|
#if TARGET_HOST_UNIX_X11
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/time.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
Reference in New Issue
Block a user