diff options
| author | orudge <orudge@openttd.org> | 2007-06-24 20:41:24 +0000 |
|---|---|---|
| committer | orudge <orudge@openttd.org> | 2007-06-24 20:41:24 +0000 |
| commit | 0bad65bf78af4e3caa13f4f8473186a533295364 (patch) | |
| tree | eb62070798094381d5ade07d432a81133deddf10 /src | |
| parent | 58451059debb034a4620c383a4308ea2b34a01c2 (diff) | |
| download | openttd-0bad65bf78af4e3caa13f4f8473186a533295364.tar.xz | |
(svn r10310) -Fix: Trunk can now be built on OS/2 :)
Diffstat (limited to 'src')
| -rw-r--r-- | src/driver.cpp | 2 | ||||
| -rw-r--r-- | src/os2.cpp | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/driver.cpp b/src/driver.cpp index c134fe903..76516af6a 100644 --- a/src/driver.cpp +++ b/src/driver.cpp @@ -64,7 +64,7 @@ static const DriverDesc _music_driver_descs[] = { #if defined(LIBTIMIDITY) M("libtimidity", "LibTimidity MIDI Driver", &_libtimidity_music_driver), #endif /* LIBTIMIDITY */ -#if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(PSP) +#if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(__OS2__) && !defined(PSP) M("extmidi", "External MIDI Driver", &_extmidi_music_driver), #endif #endif diff --git a/src/os2.cpp b/src/os2.cpp index 1772f0136..6f7da9a41 100644 --- a/src/os2.cpp +++ b/src/os2.cpp @@ -12,6 +12,7 @@ #include "functions.h" #include "macros.h" #include "fileio.h" +#include "fios.h" // opendir/readdir/closedir #include <dirent.h> #include <unistd.h> @@ -124,7 +125,7 @@ bool FiosIsHiddenFile(const struct dirent *ent) return ent->d_name[0] == '.'; } -void ShowInfo(const unsigned char *str) +void ShowInfo(const char *str) { HAB hab; HMQ hmq; @@ -134,14 +135,14 @@ void ShowInfo(const unsigned char *str) hmq = WinCreateMsgQueue((hab = WinInitialize(0)), 0); // display the box - rc = WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, str, (const unsigned char *)"OpenTTD", 0, MB_OK | MB_MOVEABLE | MB_INFORMATION); + rc = WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, (const unsigned char *)str, (const unsigned char *)"OpenTTD", 0, MB_OK | MB_MOVEABLE | MB_INFORMATION); // terminate PM env. WinDestroyMsgQueue(hmq); WinTerminate(hab); } -void ShowOSErrorBox(const unsigned char *buf) +void ShowOSErrorBox(const char *buf) { HAB hab; HMQ hmq; @@ -151,7 +152,7 @@ void ShowOSErrorBox(const unsigned char *buf) hmq = WinCreateMsgQueue((hab = WinInitialize(0)), 0); // display the box - rc = WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, buf, (const unsigned char *)"OpenTTD", 0, MB_OK | MB_MOVEABLE | MB_ERROR); + rc = WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, (const unsigned char *)buf, (const unsigned char *)"OpenTTD", 0, MB_OK | MB_MOVEABLE | MB_ERROR); // terminate PM env. WinDestroyMsgQueue(hmq); |