summaryrefslogtreecommitdiff
path: root/pcsound
diff options
context:
space:
mode:
authorSimon Howard2009-06-09 18:28:51 +0000
committerSimon Howard2009-06-09 18:28:51 +0000
commit122dcc372f579c54ba2e6f793493cfa4d0a7d609 (patch)
tree5df714640d4ae007e95540c89b8f6f0d80f79767 /pcsound
parent46ad00deca23f3c57fcaed47af67f9003d6a4048 (diff)
parentb6491fa4aefc073a760d4bad51f55c2d6c0f5f35 (diff)
downloadchocolate-doom-122dcc372f579c54ba2e6f793493cfa4d0a7d609.tar.gz
chocolate-doom-122dcc372f579c54ba2e6f793493cfa4d0a7d609.tar.bz2
chocolate-doom-122dcc372f579c54ba2e6f793493cfa4d0a7d609.zip
Merge from trunk.
Subversion-branch: /branches/raven-branch Subversion-revision: 1579
Diffstat (limited to 'pcsound')
-rw-r--r--pcsound/pcsound.c1
-rw-r--r--pcsound/pcsound_win32.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/pcsound/pcsound.c b/pcsound/pcsound.c
index 0746e24e..09ef2752 100644
--- a/pcsound/pcsound.c
+++ b/pcsound/pcsound.c
@@ -27,6 +27,7 @@
#include <stdlib.h>
#include <string.h>
+#include "SDL_getenv.h"
#include "config.h"
#include "pcsound.h"
#include "pcsound_internal.h"
diff --git a/pcsound/pcsound_win32.c b/pcsound/pcsound_win32.c
index 7976b444..0eb8cd6a 100644
--- a/pcsound/pcsound_win32.c
+++ b/pcsound/pcsound_win32.c
@@ -26,6 +26,7 @@
#ifdef _WIN32
#include "SDL.h"
+#include "SDL_thread.h"
#include <windows.h>
#include "pcsound.h"