sumom****@users*****
sumom****@users*****
2008年 7月 24日 (木) 18:18:10 JST
Index: julius4/libsent/src/adin/adin_mic_freebsd.c
diff -u julius4/libsent/src/adin/adin_mic_freebsd.c:1.3 julius4/libsent/src/adin/adin_mic_freebsd.c:1.4
--- julius4/libsent/src/adin/adin_mic_freebsd.c:1.3 Tue Dec 18 17:45:50 2007
+++ julius4/libsent/src/adin/adin_mic_freebsd.c Thu Jul 24 18:18:09 2008
@@ -39,7 +39,7 @@
* @author Akinobu LEE
* @date Sun Feb 13 16:18:26 2005
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
*/
/*
@@ -62,9 +62,9 @@
#include <poll.h>
/* sound header */
-#ifdef HAVE_SYS_SOUNDCARD_H
+#if defined(HAVE_SYS_SOUNDCARD_H)
#include <sys/soundcard.h>
-#elif HAVE_MACHINE_SOUNDCARD_H
+#elif defined(HAVE_MACHINE_SOUNDCARD_H)
#include <machine/soundcard.h>
#endif
Index: julius4/libsent/src/adin/adin_mic_linux.c
diff -u julius4/libsent/src/adin/adin_mic_linux.c:1.1 julius4/libsent/src/adin/adin_mic_linux.c:1.2
--- julius4/libsent/src/adin/adin_mic_linux.c:1.1 Tue Jul 1 22:44:09 2008
+++ julius4/libsent/src/adin/adin_mic_linux.c Thu Jul 24 18:18:09 2008
@@ -20,7 +20,7 @@
* @author Akinobu LEE
* @date Sun Feb 13 16:18:26 2005
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
*/
/*
@@ -44,11 +44,11 @@
boolean
adin_mic_standby(int sfreq, void *dummy)
{
-#ifdef HAS_ALSA
+#if defined(HAS_ALSA)
return(adin_alsa_standby(sfreq, dummy));
-#elif HAS_OSS
+#elif defined(HAS_OSS)
return(adin_oss_standby(sfreq, dummy));
-#elif HAS_ESD
+#elif defined(HAS_ESD)
return(adin_esd_standby(sfreq, dummy));
#else /* other than Linux */
jlog("Error: neither of alsa/oss/esd device is available\n");
@@ -64,11 +64,11 @@
boolean
adin_mic_begin()
{
-#ifdef HAS_ALSA
+#if defined(HAS_ALSA)
return(adin_alsa_begin());
-#elif HAS_OSS
+#elif defined(HAS_OSS)
return(adin_oss_begin());
-#elif HAS_ESD
+#elif defined(HAS_ESD)
return(adin_esd_begin());
#else /* other than Linux */
jlog("Error: neither of alsa/oss/esd device is available\n");
@@ -84,11 +84,11 @@
boolean
adin_mic_end()
{
-#ifdef HAS_ALSA
+#if defined(HAS_ALSA)
return(adin_alsa_end());
-#elif HAS_OSS
+#elif defined(HAS_OSS)
return(adin_oss_end());
-#elif HAS_ESD
+#elif defined(HAS_ESD)
return(adin_esd_end());
#else /* other than Linux */
jlog("Error: neither of alsa/oss/esd device is available\n");
@@ -111,11 +111,11 @@
int
adin_mic_read(SP16 *buf, int sampnum)
{
-#ifdef HAS_ALSA
+#if defined(HAS_ALSA)
return(adin_alsa_read(buf, sampnum));
-#elif HAS_OSS
+#elif defined(HAS_OSS)
return(adin_oss_read(buf, sampnum));
-#elif HAS_ESD
+#elif defined(HAS_ESD)
return(adin_esd_read(buf, sampnum));
#else /* other than Linux */
jlog("Error: neither of alsa/oss/esd device is available\n");
Index: julius4/libsent/src/adin/adin_mic_linux_alsa.c
diff -u julius4/libsent/src/adin/adin_mic_linux_alsa.c:1.6 julius4/libsent/src/adin/adin_mic_linux_alsa.c:1.7
--- julius4/libsent/src/adin/adin_mic_linux_alsa.c:1.6 Tue Jul 1 13:29:46 2008
+++ julius4/libsent/src/adin/adin_mic_linux_alsa.c Thu Jul 24 18:18:09 2008
@@ -44,7 +44,7 @@
* @author Akinobu LEE
* @date Sun Feb 13 16:18:26 2005
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
*/
/*
@@ -63,9 +63,9 @@
#ifdef HAS_ALSA
-#ifdef HAVE_ALSA_ASOUNDLIB_H
+#if defined(HAVE_ALSA_ASOUNDLIB_H)
#include <alsa/asoundlib.h>
-#elif HAVE_SYS_ASOUNDLIB_H
+#elif defined(HAVE_SYS_ASOUNDLIB_H)
#include <sys/asoundlib.h>
#endif
Index: julius4/libsent/src/adin/adin_mic_linux_oss.c
diff -u julius4/libsent/src/adin/adin_mic_linux_oss.c:1.4 julius4/libsent/src/adin/adin_mic_linux_oss.c:1.5
--- julius4/libsent/src/adin/adin_mic_linux_oss.c:1.4 Tue Jul 1 13:29:46 2008
+++ julius4/libsent/src/adin/adin_mic_linux_oss.c Thu Jul 24 18:18:09 2008
@@ -51,7 +51,7 @@
* @author Akinobu LEE
* @date Sun Feb 13 16:18:26 2005
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
*/
/*
@@ -72,9 +72,9 @@
/* sound header */
#ifdef HAS_OSS
-#ifdef HAVE_SYS_SOUNDCARD_H
+#if defined(HAVE_SYS_SOUNDCARD_H)
#include <sys/soundcard.h>
-#elif HAVE_MACHINE_SOUNDCARD_H
+#elif defined(HAVE_MACHINE_SOUNDCARD_H)
#include <machine/soundcard.h>
#endif
#endif