diff options
| author | Jonathan Gray | 2003-05-18 13:39:02 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-05-18 13:39:02 +0000 |
| commit | cf54a636396002c268404b8ba4f11a84fc99a127 (patch) | |
| tree | 0d33f586cef902a95fa3aedd0aa986c2c2a78e4f | |
| parent | 657c8ca2e3960346a601aaf16e7d3b4068820bed (diff) | |
| download | scummvm-rg350-cf54a636396002c268404b8ba4f11a84fc99a127.tar.gz scummvm-rg350-cf54a636396002c268404b8ba4f11a84fc99a127.tar.bz2 scummvm-rg350-cf54a636396002c268404b8ba4f11a84fc99a127.zip | |
HAVE_CONFIG_H
svn-id: r7632
| -rw-r--r-- | backends/midi/alsa.cpp | 4 | ||||
| -rw-r--r-- | common/gameDetector.cpp | 4 | ||||
| -rw-r--r-- | common/scummsys.h | 6 | ||||
| -rw-r--r-- | sound/mixer.h | 4 |
4 files changed, 16 insertions, 2 deletions
diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp index e2fc50ad74..5d039cbdc0 100644 --- a/backends/midi/alsa.cpp +++ b/backends/midi/alsa.cpp @@ -19,6 +19,10 @@ * $Header$ */ +#if defined(HAVE_CONFIG_H) +#include "config.h" +#endif + #if defined(UNIX) && defined(USE_ALSA) #include "sound/mpu401.h" diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp index a45ed45d0d..2d4dafb226 100644 --- a/common/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -27,6 +27,10 @@ #include "config-file.h" #include "scaler.h" // Only for gfx_modes +#if defined(HAVE_CONFIG_H) +#include "config.h" +#endif + #define CHECK_OPTION() if ((current_option != NULL) || (*s != '\0')) goto ShowHelpAndExit #define HANDLE_OPTION() if ((*s == '\0') && (current_option == NULL)) goto ShowHelpAndExit; \ if ((*s != '\0') && (current_option != NULL)) goto ShowHelpAndExit; \ diff --git a/common/scummsys.h b/common/scummsys.h index 3bdd10440f..be4b821139 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -25,7 +25,9 @@ #include <stdlib.h> // TODO - use config.h, generated by configure -//#include "config.h" +#if defined(HAVE_CONFIG_H) +#include "config.h" +#endif #if defined(USE_MAD) || defined(USE_VORBIS) #define COMPRESSED_SOUND_FILE @@ -123,7 +125,7 @@ #define FORCEINLINE inline #define CDECL - #ifndef CONFIG_H + #ifndef HAVE_CONFIG_H typedef unsigned char byte; typedef unsigned char uint8; typedef unsigned short uint16; diff --git a/sound/mixer.h b/sound/mixer.h index 61ef5553a6..d98c670098 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -23,6 +23,10 @@ #ifndef MIXER_H #define MIXER_H +#if defined(HAVE_CONFIG_H) +#include "config.h" +#endif + #include <stdio.h> #ifdef USE_MAD |