Migrate FlightGear code to use "#include SG_GL*" defined in

[flightgear.git] / src / ATC / ATCVoice.hxx

diff --git a/src/ATC/ATCVoice.hxx b/src/ATC/ATCVoice.hxx
index 5b61f75c0725a9952d43c42365ce5c38867c0bac..9d9fb7d92be9e37625f279b84920ea42f02d0e5a 100644 (file)
--- a/src/ATC/ATCVoice.hxx
+++ b/src/ATC/ATCVoice.hxx
@@ -23,13 +23,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <fstream>
-#  include <iostream>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <fstream.h>
-#  include <iostream.h>
-#elif defined( __BORLANDC__ ) || (__APPLE__)
+#if defined( SG_HAVE_STD_INCLUDES ) || defined( __BORLANDC__ ) || (__APPLE__)
 #  include <fstream>
 #  include <iostream>
 #else
@@ -41,16 +35,16 @@
 #include <list>
 #include <string>
 
+#include <simgear/sound/sample_openal.hxx>
+
 SG_USING_STD(map);
 SG_USING_STD(list);
 SG_USING_STD(string);
 
-#if !defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(cout);
 SG_USING_STD(ios);
 SG_USING_STD(ofstream);
 SG_USING_STD(ifstream);
-#endif
 
 
 struct WordData {
@@ -83,7 +77,7 @@ private:
        // the sound and word position data
        char* rawSoundData;
        unsigned int rawDataSize;
-       slSample* SoundData;
+        SGSoundSample *SoundData;
 
        // A map of words vs. byte position and length in rawSoundData
        atc_word_map_type wordMap;