Change semantic of CONFIG_*, HAVE_* and ARCH_*.

They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk

4 files changed, 13 insertions, 13 deletions

diff --git a/libavdevice/audio.c b/libavdevice/audio.c
index d056711d03..4344ecb4f1 100644
--- a/libavdevice/audio.c
+++ b/libavdevice/audio.c
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
-#ifdef HAVE_SOUNDCARD_H
+#if HAVE_SOUNDCARD_H
 #include <soundcard.h>
 #else
 #include <sys/soundcard.h>
@@ -311,7 +311,7 @@ static int audio_read_close(AVFormatContext *s1)
     return 0;
 }
 
-#ifdef CONFIG_OSS_DEMUXER
+#if CONFIG_OSS_DEMUXER
 AVInputFormat oss_demuxer = {
     "oss",
     NULL_IF_CONFIG_SMALL("Open Sound System capture"),
@@ -324,7 +324,7 @@ AVInputFormat oss_demuxer = {
 };
 #endif
 
-#ifdef CONFIG_OSS_MUXER
+#if CONFIG_OSS_MUXER
 AVOutputFormat oss_muxer = {
     "oss",
     NULL_IF_CONFIG_SMALL("Open Sound System playback"),
diff --git a/libavdevice/beosaudio.cpp b/libavdevice/beosaudio.cpp
index def1fad608..84e7c77905 100644
--- a/libavdevice/beosaudio.cpp
+++ b/libavdevice/beosaudio.cpp
@@ -33,7 +33,7 @@ extern "C" {
 #include "libavformat/avformat.h"
 }
 
-#ifdef HAVE_BSOUNDRECORDER
+#if HAVE_BSOUNDRECORDER
 #include <SoundRecorder.h>
 using namespace BPrivate::Media::Experimental;
 #endif
@@ -63,7 +63,7 @@ typedef struct {
     sem_id output_sem;
     int output_index;
     BSoundPlayer *player;
-#ifdef HAVE_BSOUNDRECORDER
+#if HAVE_BSOUNDRECORDER
     BSoundRecorder *recorder;
 #endif
     int has_quit; /* signal callbacks not to wait */
@@ -150,7 +150,7 @@ static void audioplay_callback(void *cookie, void *buffer, size_t bufferSize, co
     }
 }
 
-#ifdef HAVE_BSOUNDRECORDER
+#if HAVE_BSOUNDRECORDER
 /* called back by BSoundRecorder */
 static void audiorecord_callback(void *cookie, bigtime_t timestamp, void *buffer, size_t bufferSize, const media_multi_audio_format &format)
 {
@@ -192,7 +192,7 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device)
     media_raw_audio_format format;
     media_multi_audio_format iformat;
 
-#ifndef HAVE_BSOUNDRECORDER
+#if !HAVE_BSOUNDRECORDER
     if (!is_output)
         return AVERROR(EIO); /* not for now */
 #endif
@@ -210,7 +210,7 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device)
     s->frame_size = AUDIO_BLOCK_SIZE;
     /* bump up the priority (avoid realtime though) */
     set_thread_priority(find_thread(NULL), B_DISPLAY_PRIORITY+1);
-#ifdef HAVE_BSOUNDRECORDER
+#if HAVE_BSOUNDRECORDER
     if (!is_output) {
         bool wait_for_input = false;
         if (audio_device && !strcmp(audio_device, "wait:"))
@@ -273,7 +273,7 @@ static int audio_close(AudioData *s)
     }
     if (s->player)
         delete s->player;
-#ifdef HAVE_BSOUNDRECORDER
+#if HAVE_BSOUNDRECORDER
     if (s->recorder)
         delete s->recorder;
 #endif
diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c
index ea9a6e25e1..86590d0891 100644
--- a/libavdevice/bktr.c
+++ b/libavdevice/bktr.c
@@ -26,13 +26,13 @@
 
 #define _BSD_SOURCE 1
 #include "libavformat/avformat.h"
-#if defined (HAVE_DEV_BKTR_IOCTL_METEOR_H) && defined (HAVE_DEV_BKTR_IOCTL_BT848_H)
+#if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H
 # include <dev/bktr/ioctl_meteor.h>
 # include <dev/bktr/ioctl_bt848.h>
-#elif defined (HAVE_MACHINE_IOCTL_METEOR_H) && defined (HAVE_MACHINE_IOCTL_BT848_H)
+#elif HAVE_MACHINE_IOCTL_METEOR_H && HAVE_MACHINE_IOCTL_BT848_H
 # include <machine/ioctl_meteor.h>
 # include <machine/ioctl_bt848.h>
-#elif defined (HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H) && defined (HAVE_DEV_VIDEO_METEOR_IOCTL_BT848_H)
+#elif HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H && HAVE_DEV_VIDEO_METEOR_IOCTL_BT848_H
 # include <dev/video/meteor/ioctl_meteor.h>
 # include <dev/video/bktr/ioctl_bt848.h>
 #elif HAVE_DEV_IC_BT8XX_H
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 1efed83f3b..e6e142a807 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -35,7 +35,7 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/time.h>
-#ifdef HAVE_SYS_VIDEOIO_H
+#if HAVE_SYS_VIDEOIO_H
 #include <sys/videoio.h>
 #else
 #include <asm/types.h>