From e858314a9f1c0adb0a8c2ec2dd1536e111932650 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Fri, 22 May 2020 18:00:18 +0300
Subject: OpenAL configs

---
 src/audio/oal/stream.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/audio/oal/stream.cpp')

diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index 5a9c7d7d..34518f54 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -1,11 +1,9 @@
-#include "stream.h"
+#include "common.h"
 
 #ifdef AUDIO_OAL
-#include "common.h"
+#include "stream.h"
 #include "sampman.h"
 
-#include <sndfile.h>
-#include <mpg123.h>
 #ifdef _WIN32
 typedef long ssize_t;
 #pragma comment( lib, "libsndfile-1.lib" )
@@ -13,6 +11,8 @@ typedef long ssize_t;
 #else
 #include "crossplatform.h"
 #endif
+#include <sndfile.h>
+#include <mpg123.h>
 
 class CSndFile : public IDecoder
 {
-- 
cgit v1.2.3


From a9f332f2d96b6a8b6f83b5da5c1c320d2ff4eab2 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Fri, 22 May 2020 21:26:31 +0300
Subject: Possibly fix travis

---
 src/audio/oal/stream.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/audio/oal/stream.cpp')

diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index 34518f54..c70cd2c1 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -8,11 +8,12 @@
 typedef long ssize_t;
 #pragma comment( lib, "libsndfile-1.lib" )
 #pragma comment( lib, "libmpg123.lib" )
-#else
-#include "crossplatform.h"
 #endif
 #include <sndfile.h>
 #include <mpg123.h>
+#ifndef _WIN32
+#include "crossplatform.h"
+#endif
 
 class CSndFile : public IDecoder
 {
-- 
cgit v1.2.3


From c993e99e0086aae50357c8ffa180de54396ede92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Fri, 22 May 2020 22:49:54 +0300
Subject: Fix linux build

---
 src/audio/oal/stream.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/audio/oal/stream.cpp')

diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index c70cd2c1..34518f54 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -8,12 +8,11 @@
 typedef long ssize_t;
 #pragma comment( lib, "libsndfile-1.lib" )
 #pragma comment( lib, "libmpg123.lib" )
+#else
+#include "crossplatform.h"
 #endif
 #include <sndfile.h>
 #include <mpg123.h>
-#ifndef _WIN32
-#include "crossplatform.h"
-#endif
 
 class CSndFile : public IDecoder
 {
-- 
cgit v1.2.3