diff options
| author | David I. Lehn <dlehn@users.sourceforge.net> | 2002-09-14 14:56:49 +0000 |
|---|---|---|
| committer | David I. Lehn <dlehn@users.sourceforge.net> | 2002-09-14 14:56:49 +0000 |
| commit | 23a00895bd8de44ca9e1dd8d505cdf2d28b29abc (patch) | |
| tree | 252f6038cbd98cc6445fa9784c16abd496b664f2 | |
| parent | 3b6498122f27067ec47c3bc1f3ca28129e6bf9e8 (diff) | |
| download | gstreamer-plugins-bad-23a00895bd8de44ca9e1dd8d505cdf2d28b29abc.tar.gz | |
s/if define/if defined/
Original commit message from CVS:
s/if define/if defined/
| -rw-r--r-- | sys/cdrom/gstcdplayer_ioctl.c | 14 | ||||
| -rw-r--r-- | sys/cdrom/gstcdplayer_ioctl.h | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/sys/cdrom/gstcdplayer_ioctl.c b/sys/cdrom/gstcdplayer_ioctl.c index 0f14675c2..f137d953b 100644 --- a/sys/cdrom/gstcdplayer_ioctl.c +++ b/sys/cdrom/gstcdplayer_ioctl.c @@ -34,13 +34,13 @@ static void cd_fix_track_range(struct cd *cd,gint *start_track,gint *end_track); static gint cddb_sum(gint n); -#ifdef HAVE_LINUX_CDROM_H +#if defined(HAVE_LINUX_CDROM_H) #include <linux/cdrom.h> -#elif defined HAVE_SYS_CDIO_H +#elif defined(HAVE_SYS_CDIO_H) #include <sys/cdio.h> /* irix cdaudio works quite a bit differently than ioctl(), so its not ready -#elif define HAVE_DMEDIA_CDAUDIO_H +#elif defined(HAVE_DMEDIA_CDAUDIO_H) #include <dmedia/cdaudio.h> */ #endif @@ -55,12 +55,12 @@ irix cdaudio works quite a bit differently than ioctl(), so its not ready gint cd_current_track(struct cd *cd); gboolean cd_close(struct cd *cd); */ -#ifdef HAVE_CDROM_SOLARIS +#if defined(HAVE_CDROM_SOLARIS) #include "gstcdplayer_ioctl_solaris.h" -#elif define HAVE_CDROM_BSD +#elif defined(HAVE_CDROM_BSD) #include "gstcdplayer_ioctl_bsd.h" /* -#elif define HAVE_CDROM_IRIX +#elif defined(HAVE_CDROM_IRIX) #include "gstcdplayer_ioctl_irix.h" */ #endif @@ -118,5 +118,3 @@ guint32 cd_cddb_discid(struct cd *cd) return ((n % 0xff) << 24 | t << 8 | (cd->num_tracks)); } - - diff --git a/sys/cdrom/gstcdplayer_ioctl.h b/sys/cdrom/gstcdplayer_ioctl.h index e9fa1a638..986d1b2d3 100644 --- a/sys/cdrom/gstcdplayer_ioctl.h +++ b/sys/cdrom/gstcdplayer_ioctl.h @@ -66,5 +66,3 @@ gboolean cd_close(struct cd *cd); guint32 cd_cddb_discid(struct cd *cd); #endif - - |