|
From: Andre R. <and...@us...> - 2004-10-23 22:52:20
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10135/Frontier/Common/source Modified Files: shell.c Log Message: Sanitized global includes. Include frontier.h in all source files. Move inclusion of system header files into osincludes.h. Index: shell.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shell.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** shell.c 9 Oct 2004 08:00:56 -0000 1.1 --- shell.c 23 Oct 2004 22:52:10 -0000 1.2 *************** *** 24,41 **** ******************************************************************************/ #ifdef MACVERSION #include <land.h> - #include <standard.h> #include <SetUpA5.h> - #include "WinSockNetEvents.h" #include "player.h" /*7.0b4 PBS*/ #endif - #ifdef WIN95VERSION - #include "standard.h" - #endif - - #include "frontierconfig.h" #include "about.h" --- 24,36 ---- ******************************************************************************/ + #include "frontier.h" + #include "standard.h" #ifdef MACVERSION #include <land.h> #include <SetUpA5.h> #include "player.h" /*7.0b4 PBS*/ #endif #include "frontierconfig.h" #include "about.h" *************** *** 81,84 **** --- 76,80 ---- #include "dockmenu.h" #include "services.h" + #include "WinSockNetEvents.h" #ifdef flcomponent *************** *** 976,980 **** */ ! #ifdef MACVERSION UnloadSeg (&initsegment); #endif --- 972,976 ---- */ ! #if defined(MACVERSION) && !TARGET_API_MAC_CARBON UnloadSeg (&initsegment); #endif |