mirror of
https://git.code.sf.net/p/quake/quake2forge
synced 2024-12-12 13:42:21 +00:00
- Added configure test for sys/soundcard.h
- Renamed linux/soundcard.h in src/snd.c to sys/soundcard.h as it's portable
This commit is contained in:
parent
76847ab8a3
commit
076eccb5c0
2 changed files with 8 additions and 7 deletions
|
@ -49,7 +49,7 @@ AC_PATH_X
|
||||||
AC_HEADER_DIRENT
|
AC_HEADER_DIRENT
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
dnl AC_HEADER_SYS_WAIT
|
dnl AC_HEADER_SYS_WAIT
|
||||||
dnl AC_CHECK_HEADERS([ your header here ])
|
AC_CHECK_HEADERS([ sys/soundcard.h ])
|
||||||
|
|
||||||
# Checks for typedefs, structures, and compiler characteristics.
|
# Checks for typedefs, structures, and compiler characteristics.
|
||||||
AC_C_CONST
|
AC_C_CONST
|
||||||
|
|
13
src/snd.c
13
src/snd.c
|
@ -21,6 +21,10 @@
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
/* merged in from snd_irix.c -- jaq */
|
/* merged in from snd_irix.c -- jaq */
|
||||||
#ifndef __sgi
|
#ifndef __sgi
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
@ -33,13 +37,10 @@
|
||||||
#include <sys/shm.h>
|
#include <sys/shm.h>
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
/* merged in from snd_bsd.c -- jaq */
|
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef HAVE_SYS_SOUNDCARD_H
|
||||||
#include <linux/soundcard.h>
|
# include <sys/soundcard.h> /* others might be just soundcard.h */
|
||||||
#else /* bsd */
|
#endif
|
||||||
#include <soundcard.h> /* freebsd might be <sys/soundcard.h> */
|
|
||||||
#endif /* __linux__ */
|
|
||||||
|
|
||||||
#else /* __sgi */
|
#else /* __sgi */
|
||||||
#include <dmedia/dmedia.h>
|
#include <dmedia/dmedia.h>
|
||||||
|
|
Loading…
Reference in a new issue