From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Wed, 8 May 2013 03:22:54 +0000 (-0600)
Subject: Update operating system detection for condition compilation.
X-Git-Tag: debian-0.9.0-1~6
X-Git-Url: http://git.kpe.io/?p=wdq2wav.git;a=commitdiff_plain;h=191a48d05177c652a36e70fdd929eb9b09e83536

Update operating system detection for condition compilation.
---

diff --git a/wdq2wav.cpp b/wdq2wav.cpp
index 5c35d4c..be084f8 100644
--- a/wdq2wav.cpp
+++ b/wdq2wav.cpp
@@ -806,10 +806,10 @@ WavFile::WriteFile ()
   return true;
 }
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #include <mmsystem.h>
-#elif defined(LINUX)
+#elif defined(__linux__)
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
 #endif
@@ -817,10 +817,10 @@ WavFile::WriteFile ()
 bool
 WavFile::Play ()
 {
-#ifdef WIN32
+#ifdef _WIN32
   if (PlaySound ((LPCSTR) m_data, 0, SND_MEMORY | SND_NODEFAULT))
     return true;
-#elif defined(LINUX)
+#elif defined(__linux__)
   int fd;
   if ((fd = open ("/dev/dsp",O_WRONLY)) == -1) {
     error_msg ("Error opening /dev/dsp");
diff --git a/wdq2wav.h b/wdq2wav.h
index 6e740f4..a5e5ad2 100644
--- a/wdq2wav.h
+++ b/wdq2wav.h
@@ -35,14 +35,14 @@
 #include <math.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef WIN32
+#ifdef _WIN32
 #include <io.h>
 #include <getopt.h>
 #else
 #include <unistd.h>
 #endif
 
-#ifdef LINUX
+#ifdef __linux__
 #include <endian.h>
 #if __BYTE_ORDER == __BIG_ENDIAN
 #define WORDS_BIG_ENDIAN 1