From 8dd5c3173cbbc8f13c208a16b3188471430f21ca Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Sun, 13 Jul 2008 13:01:22 +0200
Subject: [PATCH] Always build with OpenC.

Removed the possiblity of building SDL without OpenC. No sane person
will want to use SDL without it anyway and the so called "SymbianC"
version was crashing.
---
 src/main/symbian/SDL_main.cpp | 17 -----------------
 symbian/sdl.mmp               | 12 ------------
 2 files changed, 29 deletions(-)

diff --git a/src/main/symbian/SDL_main.cpp b/src/main/symbian/SDL_main.cpp
index 063f795..65b5495 100644
--- a/src/main/symbian/SDL_main.cpp
+++ b/src/main/symbian/SDL_main.cpp
@@ -23,10 +23,6 @@
 #include "dsa.h"
 #include "SDL_loadso.h"
 
-#ifdef SYMBIANC
-#include <reent.h>
-#endif
-
 //Markus Mertama
 
 
@@ -815,11 +811,6 @@ LOCAL_C TInt DoMain(TAny* /*aParam*/)
 		}
  	gEpocEnv->iAppSrv->Init();	
 
-#ifdef SYMBIANC 
-    // Create stdlib 
-    _REENT;
-#endif
-
     // Call stdlib main
     int ret = 0;
 	if(EnvUtils::IsOwnThreaded())
@@ -842,16 +833,8 @@ LOCAL_C TInt DoMain(TAny* /*aParam*/)
     
     gEpocEnv->Free(); //free up in thread resources 
     
-#ifdef SYMBIANC    
-    _cleanup(); //this is normally called at exit, I call it here
-#endif
-
     if(fbsconnected)
         RFbsSession::Disconnect();
-    
-#ifdef SYMBIANC     
-    CloseSTDLIB();
-#endif
        
  //   delete as;
    	delete cleanup;	
diff --git a/symbian/sdl.mmp b/symbian/sdl.mmp
index 6481cec..4a7268f 100644
--- a/symbian/sdl.mmp
+++ b/symbian/sdl.mmp
@@ -1,14 +1,6 @@
 TARGET              sdl.lib
 TARGETTYPE          lib
 
-#define OPENC OPENC
-
-#ifdef OPENC
-MACRO 	OPENC
-#else	
-MACRO	SYMBIANC
-#endif
-
 MACRO	DISABLE_JOYSTICK
 MACRO	DISABLE_CDROM
 
@@ -67,11 +59,7 @@ SOURCE		video/symbian/SDL_epocvideo.cpp
 
 SYSTEMINCLUDE	\epoc32\include
 SYSTEMINCLUDE	\epoc32\include\GLES
-#ifdef OPENC
 SYSTEMINCLUDE	\epoc32\include\stdapis
-#else
-SYSTEMINCLUDE	\epoc32\include\libc
-#endif
 SYSTEMINCLUDE	include
 SYSTEMINCLUDE	..\include
 
-- 
2.11.4.GIT