From fb673df93424bb564884f82b8e5c7c13fba32d50 Mon Sep 17 00:00:00 2001 From: Jamie Wilkinson Date: Mon, 4 Nov 2002 13:11:40 +0000 Subject: [PATCH] - Applied a patch from Ulrich Spoerlein that fixes build problems on OpenBSD. --- configure.in | 24 ++++++++++++++++++------ src/glw.h | 3 ++- src/qgl.c | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index 63e481f..64e6dc1 100644 --- a/configure.in +++ b/configure.in @@ -208,6 +208,7 @@ dnl ----------------------- #AC_HEADER_DIRENT #AC_HEADER_STDC dnl AC_HEADER_SYS_WAIT +AC_CHECK_HEADERS([ soundcard.h ]) AC_CHECK_HEADERS([ sys/soundcard.h ]) dnl ------------------------------------------------------------- @@ -234,17 +235,28 @@ AC_TRY_LINK( if test "x$ac_cv_header_sys_soundcard_h" = "xyes"; then AC_MSG_CHECKING(for AFMT_S16_NE in sys/soundcard.h) AC_EGREP_CPP([QF_maGiC_VALUE], - [ - #include - #ifdef AFMT_S16_NE - QF_maGiC_VALUE - #endif - ], + [ #include + #ifdef AFMT_S16_NE + QF_maGiC_VALUE + #endif ], HAVE_AFMT_S16_NE=yes AC_MSG_RESULT(yes) , AC_MSG_RESULT(no) ) +else if test "x$ac_cv_header_soundcard_h" = "xyes"; then + AC_MSG_CHECKING(for AFMT_S16_NE in soundcard.h) + AC_EGREP_CPP([QF_maGiC_VALUE], + [ #include + #ifdef AFMT_S16_NE + QF_maGiC_VALUE + #endif ], + HAVE_AFMT_S16_NE=yes + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) + ) + fi fi AC_SUBST(HAVE_AFMT_S16_NE) diff --git a/src/glw.h b/src/glw.h index a3a3791..50dd180 100644 --- a/src/glw.h +++ b/src/glw.h @@ -30,7 +30,8 @@ #ifndef __GLW_H__ #define __GLW_H__ -#if defined __linux__ || defined __bsd__ || defined __sgi || defined __FreeBSD__ || defined __NetBSD__ +/* This is getting silly -- q */ +#if defined __linux__ || defined __bsd__ || defined __sgi || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ typedef struct { diff --git a/src/qgl.c b/src/qgl.c index 5d75b30..422d67f 100644 --- a/src/qgl.c +++ b/src/qgl.c @@ -3039,7 +3039,7 @@ void QGL_Shutdown( void ) } /* merged in from qgl_bsd.c -- jaq */ -#if defined(__linux__) || defined (__FreeBSD__) || defined(__NetBSD__) +#if defined(__linux__) || defined (__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) #define GPA( a ) dlsym( glw_state.OpenGLLib, a ) void *qwglGetProcAddress(char *symbol)