From 593e664e8b658d1d5551232b8754bba51f481753 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Wed, 19 Oct 2005 06:40:33 +0000 Subject: [PATCH] Apply patch 1329540: Fixes compilation on GCC4.1 Changed order of definitions as well. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2349 --- include/programs.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/include/programs.h b/include/programs.h index e4d10330..90163958 100644 --- a/include/programs.h +++ b/include/programs.h @@ -30,12 +30,6 @@ #endif - -class Program; - -typedef void (PROGRAMS_Main)(Program * * make); -void PROGRAMS_MakeFile(char * name,PROGRAMS_Main * main); - class Program { public: Program(); @@ -47,12 +41,15 @@ public: CommandLine * cmd; DOS_PSP * psp; virtual void Run(void)=0; - bool Program::GetEnvStr(const char * entry,std::string & result); + bool GetEnvStr(const char * entry,std::string & result); bool GetEnvNum(Bitu num,std::string & result); Bitu GetEnvCount(void); bool SetEnv(const char * entry,const char * new_string); - void WriteOut(const char * format,...); /* Write to standard output */ + void WriteOut(const char * format,...); /* Write to standard output */ }; +typedef void (PROGRAMS_Main)(Program * * make); +void PROGRAMS_MakeFile(char * name,PROGRAMS_Main * main); + #endif