(svn r2690) - Minor cleanups to os2.c and hal.h

pull/155/head
orudge 19 years ago
parent b7d4beb440
commit 3ebab651af

@ -59,10 +59,6 @@ extern const DriverDesc _music_driver_descs[];
extern const HalMusicDriver _bemidi_music_driver; extern const HalMusicDriver _bemidi_music_driver;
#endif #endif
#if defined(__OS2__)
extern const HalMusicDriver _os2_music_driver;
#endif
extern const HalVideoDriver _dedicated_video_driver; extern const HalVideoDriver _dedicated_video_driver;
enum DriverType { enum DriverType {

@ -1,13 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include "openttd.h" #include "openttd.h"
#include "variables.h" #include "variables.h"
#include "window.h"
#include "string.h" #include "string.h"
#include "table/strings.h" #include "table/strings.h"
#include "hal.h"
#include "gfx.h" #include "gfx.h"
#include "gui.h" #include "gui.h"
#include "saveload.h"
#include "functions.h" #include "functions.h"
#include "macros.h" #include "macros.h"
@ -22,19 +19,13 @@
#include <dos.h> #include <dos.h>
#define INCL_DOS #define INCL_DOS
#define INCL_OS2MM
#define INCL_WIN #define INCL_WIN
#define INCL_WINCLIPBOARD #define INCL_WINCLIPBOARD
#include <os2.h> #include <os2.h>
#include <os2me.h>
#include <i86.h> #include <i86.h>
#if defined(WITH_SDL)
#include <SDL.h>
#endif
#include "sound/null_s.h" #include "sound/null_s.h"
#include "sound/sdl_s.h" #include "sound/sdl_s.h"

Loading…
Cancel
Save