From 7d23bccc72639d61d2d060ddc10210bbc1b28bd3 Mon Sep 17 00:00:00 2001 From: Sjoerd van der Berg Date: Sat, 24 Aug 2002 09:21:38 +0000 Subject: [PATCH] Hopefully final config setting now Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@211 --- include/dosbox.h | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/include/dosbox.h b/include/dosbox.h index c9ddd480..b277391d 100644 --- a/include/dosbox.h +++ b/include/dosbox.h @@ -19,32 +19,33 @@ #if !defined __DOSBOX_H #define __DOSBOX_H -typedef unsigned char Bit8u; -typedef signed char Bit8s; -typedef unsigned short Bit16u; -typedef signed short Bit16s; -typedef unsigned long Bit32u; -typedef signed long Bit32s; -typedef double Real64; + +void E_Exit(char * message,...); + +void S_Warn(char * message,...); + +/* The internal types */ +typedef unsigned char Bit8u; +typedef signed char Bit8s; +typedef unsigned short Bit16u; +typedef signed short Bit16s; +typedef unsigned long Bit32u; +typedef signed long Bit32s; +typedef double Real64; #if defined(_MSC_VER) -typedef unsigned __int64 Bit64u; -typedef signed __int64 Bit64s; +typedef unsigned __int64 Bit64u; +typedef signed __int64 Bit64s; #else -typedef unsigned long long int Bit64u; -typedef signed long long int Bit64s; +typedef unsigned long long Bit64u; +typedef signed long long Bit64s; #endif typedef unsigned int Bitu; typedef signed int Bits; #include - -void E_Exit(char * message,...); - -void S_Warn(char * message,...); - - -#include "../config.h" +#include "config.h" +#include "../settings.h" typedef Bitu (LoopHandler)(void); @@ -54,5 +55,7 @@ void DOSBOX_SetNormalLoop(); void DOSBOX_Init(int argc, char* argv[]); void DOSBOX_StartUp(void); + + #endif