From 210a7151be2cb791b33c3133372b08ed2d09979a Mon Sep 17 00:00:00 2001 From: OBATA Akio Date: Thu, 20 Jun 2024 17:40:24 +0900 Subject: [PATCH] fix to use AudioIOSun on Solaris and NetBSD `USE_SOLARIS` is not defined (related to TDE/tde#74). On NetBSD, native audio system audioio(4) i.e. sunaudio is preferred. Signed-off-by: OBATA Akio (cherry picked from commit 0c717ee493b802d94756b6c5f538cd686943b941) --- flow/audioiosun.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/flow/audioiosun.cpp b/flow/audioiosun.cpp index ed5722c..16dee36 100644 --- a/flow/audioiosun.cpp +++ b/flow/audioiosun.cpp @@ -45,9 +45,9 @@ #endif /* - * Only compile this AudioIO class if we're on Solaris + * Only compile this AudioIO class if we're on Solaris or NetBSD */ -#ifdef USE_SOLARIS +#if defined(__sun) || defined(__NetBSD__) #include #include @@ -55,8 +55,10 @@ #include #include +#ifdef __sun #include #include +#endif #include #include @@ -73,6 +75,10 @@ #include "iomanager.h" #include "dispatcher.h" +#ifdef __NetBSD__ +typedef u_int uint_t; +#endif + // This looks like the maximum buffer size according to the sys/audio*.h // files on Solaris7 #define SUN_MAX_BUFFER_SIZE (65536) @@ -439,4 +445,4 @@ int AudioIOSun::write(void *buffer, int size) return size; } -#endif /* USE_SOLARIS */ +#endif /* defined(__sun) || defined(__NetBSD__) */