Update operating system detection for condition compilation.

[wdq2wav.git] / wdq2wav.cpp

diff --git a/wdq2wav.cpp b/wdq2wav.cpp
index bcfd3b69267dfb8932174068efcfa37dc40e729b..be084f8bfb91d39b164b9de0664870c3bdf99234 100644 (file)
--- a/wdq2wav.cpp
+++ b/wdq2wav.cpp
@@ -8,8 +8,6 @@
 **
 **  Copyright (c) 2003 Kevin Rosenberg
 **
-**  $Id$
-**
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
 **  published by the Free Software Foundation.
@@ -24,6 +22,7 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
+#include <stdlib.h>
 #include <wdq2wav.h>
 
 const char* g_szIdStr = "$Id$";
@@ -61,13 +60,13 @@ const int g_fileMode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
 void
 error_msg (const char *msg)
 {
-  std::cerr << msg << "\n";
+  std::cerr << msg << std::endl;
 }
 
 void
 info_msg (const char* msg)
 {
-  std::cout << msg << "\n";
+  std::cout << msg << std::endl;
 }
 
 void
@@ -807,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
@@ -818,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");