Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2002-11-25 18:29:57 +0300
committerKent Mein <mein@cs.umn.edu>2002-11-25 18:29:57 +0300
commit209a2ede2cdeade0d543969e7b2ff62fee84b43e (patch)
tree28484297290b14033587b3704535db4a0bb06c71 /intern
parentd0e346d544cd3abb0007a68137b31923020f7aeb (diff)
Last of the config.h mods...
#ifdef HAVE_CONFIG_H #include <config.h> #endif added to these files. Kent -- mein@cs.umn.edu
Diffstat (limited to 'intern')
-rw-r--r--intern/SoundSystem/dummy/SND_DummyDevice.cpp4
-rw-r--r--intern/SoundSystem/fmod/SND_FmodDevice.cpp6
-rw-r--r--intern/SoundSystem/intern/SND_AudioDevice.cpp5
-rw-r--r--intern/SoundSystem/intern/SND_C-api.cpp4
-rw-r--r--intern/SoundSystem/intern/SND_CDObject.cpp3
-rw-r--r--intern/SoundSystem/intern/SND_DeviceManager.cpp4
-rw-r--r--intern/SoundSystem/intern/SND_IdObject.cpp4
-rw-r--r--intern/SoundSystem/intern/SND_Scene.cpp4
-rw-r--r--intern/SoundSystem/intern/SND_SoundListener.cpp4
-rw-r--r--intern/SoundSystem/intern/SND_SoundObject.cpp4
-rw-r--r--intern/SoundSystem/intern/SND_Utils.cpp4
-rw-r--r--intern/SoundSystem/intern/SND_WaveCache.cpp4
-rw-r--r--intern/SoundSystem/intern/SND_WaveSlot.cpp5
-rw-r--r--intern/SoundSystem/openal/SND_OpenALDevice.cpp4
-rw-r--r--intern/SoundSystem/openal/pthread_cancel.cpp5
15 files changed, 59 insertions, 5 deletions
diff --git a/intern/SoundSystem/dummy/SND_DummyDevice.cpp b/intern/SoundSystem/dummy/SND_DummyDevice.cpp
index 4d1f69c6f33..820c151377a 100644
--- a/intern/SoundSystem/dummy/SND_DummyDevice.cpp
+++ b/intern/SoundSystem/dummy/SND_DummyDevice.cpp
@@ -31,6 +31,10 @@
* SND_FmodDevice derived from SND_IAudioDevice
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef WIN32
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
#endif //WIN32
diff --git a/intern/SoundSystem/fmod/SND_FmodDevice.cpp b/intern/SoundSystem/fmod/SND_FmodDevice.cpp
index cc01b864428..6389971a1f6 100644
--- a/intern/SoundSystem/fmod/SND_FmodDevice.cpp
+++ b/intern/SoundSystem/fmod/SND_FmodDevice.cpp
@@ -31,6 +31,10 @@
* SND_FmodDevice derived from SND_IAudioDevice
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef WIN32
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
#endif //WIN32
@@ -576,4 +580,4 @@ void SND_FmodDevice::StopUsingDSP()
{
if (m_dspunit)
FSOUND_DSP_SetActive(m_dspunit, false);
-} \ No newline at end of file
+}
diff --git a/intern/SoundSystem/intern/SND_AudioDevice.cpp b/intern/SoundSystem/intern/SND_AudioDevice.cpp
index 20800153128..3fd8334d506 100644
--- a/intern/SoundSystem/intern/SND_AudioDevice.cpp
+++ b/intern/SoundSystem/intern/SND_AudioDevice.cpp
@@ -30,9 +30,12 @@
*/
#include "SND_AudioDevice.h"
-
#include "SND_SoundObject.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef WIN32
// This warning tells us about truncation of __long__ stl-generated names.
// It can occasionally cause DevStudio to have internal compiler warnings.
diff --git a/intern/SoundSystem/intern/SND_C-api.cpp b/intern/SoundSystem/intern/SND_C-api.cpp
index 8a4fc8f31a6..1b03d66562c 100644
--- a/intern/SoundSystem/intern/SND_C-api.cpp
+++ b/intern/SoundSystem/intern/SND_C-api.cpp
@@ -34,6 +34,10 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "SND_C-api.h"
#include "SND_DeviceManager.h"
#include "SND_Scene.h"
diff --git a/intern/SoundSystem/intern/SND_CDObject.cpp b/intern/SoundSystem/intern/SND_CDObject.cpp
index 97b502970b7..e4fcdfaceeb 100644
--- a/intern/SoundSystem/intern/SND_CDObject.cpp
+++ b/intern/SoundSystem/intern/SND_CDObject.cpp
@@ -36,6 +36,9 @@
#include "SND_CDObject.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
SND_CDObject* SND_CDObject::m_instance = NULL;
diff --git a/intern/SoundSystem/intern/SND_DeviceManager.cpp b/intern/SoundSystem/intern/SND_DeviceManager.cpp
index a3e72f8e9f6..d6f23ff5de4 100644
--- a/intern/SoundSystem/intern/SND_DeviceManager.cpp
+++ b/intern/SoundSystem/intern/SND_DeviceManager.cpp
@@ -34,6 +34,10 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "SND_DeviceManager.h"
#include "SND_DependKludge.h"
#include "SND_DummyDevice.h"
diff --git a/intern/SoundSystem/intern/SND_IdObject.cpp b/intern/SoundSystem/intern/SND_IdObject.cpp
index b7e13cacbe6..eac95de64a4 100644
--- a/intern/SoundSystem/intern/SND_IdObject.cpp
+++ b/intern/SoundSystem/intern/SND_IdObject.cpp
@@ -36,6 +36,10 @@
#include "SND_IdObject.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
SND_IdObject::SND_IdObject()
{
}
diff --git a/intern/SoundSystem/intern/SND_Scene.cpp b/intern/SoundSystem/intern/SND_Scene.cpp
index 4417dfbcfc9..4b59b17e458 100644
--- a/intern/SoundSystem/intern/SND_Scene.cpp
+++ b/intern/SoundSystem/intern/SND_Scene.cpp
@@ -34,6 +34,10 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef WIN32
#pragma warning (disable:4786) // Get rid of stupid stl-visual compiler debug warning
#endif //WIN32
diff --git a/intern/SoundSystem/intern/SND_SoundListener.cpp b/intern/SoundSystem/intern/SND_SoundListener.cpp
index 281da2aa7fb..0209ac5683a 100644
--- a/intern/SoundSystem/intern/SND_SoundListener.cpp
+++ b/intern/SoundSystem/intern/SND_SoundListener.cpp
@@ -36,6 +36,10 @@
#include "SND_SoundListener.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
SND_SoundListener::SND_SoundListener()
{
m_modified = true;
diff --git a/intern/SoundSystem/intern/SND_SoundObject.cpp b/intern/SoundSystem/intern/SND_SoundObject.cpp
index 69066d0a2dd..e835b012ac1 100644
--- a/intern/SoundSystem/intern/SND_SoundObject.cpp
+++ b/intern/SoundSystem/intern/SND_SoundObject.cpp
@@ -36,7 +36,9 @@
#include "SND_SoundObject.h"
-
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
SND_SoundObject::SND_SoundObject()// : m_modified(true)
{
diff --git a/intern/SoundSystem/intern/SND_Utils.cpp b/intern/SoundSystem/intern/SND_Utils.cpp
index 543251e431f..d356f17b897 100644
--- a/intern/SoundSystem/intern/SND_Utils.cpp
+++ b/intern/SoundSystem/intern/SND_Utils.cpp
@@ -48,6 +48,10 @@ extern "C" {
#include <math.h>
#include <string.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#if defined(WIN32)
#include <io.h>
#else
diff --git a/intern/SoundSystem/intern/SND_WaveCache.cpp b/intern/SoundSystem/intern/SND_WaveCache.cpp
index 279bc29aa83..0e4a2603789 100644
--- a/intern/SoundSystem/intern/SND_WaveCache.cpp
+++ b/intern/SoundSystem/intern/SND_WaveCache.cpp
@@ -34,6 +34,10 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef WIN32
#pragma warning (disable:4786) // Get rid of stupid stl-visual compiler debug warning
#endif //WIN32
diff --git a/intern/SoundSystem/intern/SND_WaveSlot.cpp b/intern/SoundSystem/intern/SND_WaveSlot.cpp
index 51356bba4bf..6c74e326743 100644
--- a/intern/SoundSystem/intern/SND_WaveSlot.cpp
+++ b/intern/SoundSystem/intern/SND_WaveSlot.cpp
@@ -29,10 +29,11 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-
#include "SND_WaveSlot.h"
-
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
SND_WaveSlot::~SND_WaveSlot()
{
diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp
index 9364b6b1dbb..67c7f1f2362 100644
--- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp
+++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp
@@ -31,6 +31,10 @@
* SND_OpenALDevice derived from SND_IAudioDevice
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef WIN32
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
#endif //WIN32
diff --git a/intern/SoundSystem/openal/pthread_cancel.cpp b/intern/SoundSystem/openal/pthread_cancel.cpp
index de05c742dea..c46c1f2c453 100644
--- a/intern/SoundSystem/openal/pthread_cancel.cpp
+++ b/intern/SoundSystem/openal/pthread_cancel.cpp
@@ -29,6 +29,11 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
* FreeBSD 3.4 does not yet have pthread_cancel (3.5 and above do)
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifdef __FreeBSD__
#include <osreldate.h>