From: Tim Moore <timoore33@gmail.com>
Date: Sun, 20 Dec 2009 09:40:26 +0000 (+0100)
Subject: Merge branch 'ehofman/sound'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fd42294faf5fbc3cc9807c98c2b9bc6d32df6173;hp=--cc;p=simgear.git

Merge branch 'ehofman/sound'

Changed include of SGQuat.hxx to SGMath.hxx in
sound/sample_openal.cxx; somehow this happened in a merge commit when
the sound branch was merged to next.
---

fd42294faf5fbc3cc9807c98c2b9bc6d32df6173
diff --cc simgear/sound/sample_openal.cxx
index 52eaea18,6a4f7cb9..16291d7d
--- a/simgear/sound/sample_openal.cxx
+++ b/simgear/sound/sample_openal.cxx
@@@ -24,20 -26,14 +26,14 @@@
  #  include <simgear_config.h>
  #endif
  
- #if defined( __APPLE__ )
- # define AL_ILLEGAL_ENUM AL_INVALID_ENUM
- # define AL_ILLEGAL_COMMAND AL_INVALID_OPERATION
- # include <OpenAL/al.h>
- # include <OpenAL/alut.h>
- #else
- # include <AL/al.h>
- # include <AL/alut.h>
- #endif
+ #include <stdlib.h>	// rand()
  
  #include <simgear/debug/logstream.hxx>
- #include <simgear/misc/sg_path.hxx>
  #include <simgear/structure/exception.hxx>
+ #include <simgear/misc/sg_path.hxx>
 -#include <simgear/math/SGQuat.hxx>
++#include <simgear/math/SGMath.hxx>
  
+ #include "soundmgr_openal.hxx"
  #include "sample_openal.hxx"