diff options
| -rw-r--r-- | common/str.cpp | 4 | ||||
| -rw-r--r-- | gui/PopUpWidget.cpp | 5 | ||||
| -rw-r--r-- | gui/newgui.cpp | 5 | ||||
| -rw-r--r-- | gui/widget.cpp | 5 | ||||
| -rw-r--r-- | scumm/dialogs.cpp | 5 | ||||
| -rw-r--r-- | scumm/gfx.cpp | 4 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 5 | ||||
| -rw-r--r-- | sound/audiostream.cpp | 4 |
8 files changed, 37 insertions, 0 deletions
diff --git a/common/str.cpp b/common/str.cpp index 2c0de82f7d..97bb7fb17e 100644 --- a/common/str.cpp +++ b/common/str.cpp @@ -23,6 +23,10 @@ #include <ctype.h> +#ifdef _MSC_VER +// Disable "unknown pragma" warning in MSVC 6 +#pragma warning(disable : 4068) +#endif namespace ScummVM { diff --git a/gui/PopUpWidget.cpp b/gui/PopUpWidget.cpp index dfd168bd47..217af0cad9 100644 --- a/gui/PopUpWidget.cpp +++ b/gui/PopUpWidget.cpp @@ -24,6 +24,11 @@ #include "newgui.h" #include "common/engine.h" +#ifdef _MSC_VER +// Disable "unknown pragma" warning in MSVC 6 +#pragma warning(disable : 4068) +#endif + #define UP_DOWN_BOX_HEIGHT 10 // Little up/down arrow diff --git a/gui/newgui.cpp b/gui/newgui.cpp index 8e8f687732..a67c1f37ee 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -27,6 +27,11 @@ # include "palm.h" #endif +#ifdef _MSC_VER +// Disable "unknown pragma" warning in MSVC 6 +#pragma warning(disable : 4068) +#endif + /* * TODO list diff --git a/gui/widget.cpp b/gui/widget.cpp index d16de51d0c..9160afe78f 100644 --- a/gui/widget.cpp +++ b/gui/widget.cpp @@ -23,6 +23,11 @@ #include "dialog.h" #include "newgui.h" +#ifdef _MSC_VER +// Disable "unknown pragma" warning in MSVC 6 +#pragma warning(disable : 4068) +#endif + Widget::Widget (Dialog *boss, int x, int y, int w, int h) : _type(0), _boss(boss), _x(x), _y(y), _w(w), _h(h), diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index ba2b72d258..ad460f8051 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -36,6 +36,11 @@ #include "gui/ListWidget.h" #include "common/config-file.h" +#ifdef _MSC_VER +// Disable "unknown pragma" warning in MSVC 6 +#pragma warning(disable : 4068) +#endif + #ifdef _WIN32_WCE #include "gapi_keys.h" extern bool _get_key_mapping; diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index a56c365a6d..ed2c16305a 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -28,6 +28,10 @@ #include "usage_bits.h" #include "util.h" +#ifdef _MSC_VER +// Disable "unknown pragma" warning in MSVC 6 +#pragma warning(disable : 4068) +#endif enum { kScrolltime = 500, // ms scrolling is supposed to take diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index faef46e4fd..270300d27b 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -52,6 +52,11 @@ #include <sys/stat.h> #endif +#ifdef _MSC_VER +// Disable "unknown pragma" warning in MSVC 6 +#pragma warning(disable : 4068) +#endif + #ifdef _WIN32_WCE extern bool isSmartphone(void); #endif diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index 0d769e3df7..c6f3ae2524 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -26,6 +26,10 @@ #include "common/file.h" #include "common/util.h" +#ifdef _MSC_VER +// Disable "unknown pragma" warning in MSVC 6 +#pragma warning(disable : 4068) +#endif template<bool is16Bit, bool isUnsigned> static inline int16 readSample(const byte *ptr) { |