From 732d041dc8d0892cc0f8f3ecbd3a59a8908d4763 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 15 Mar 2010 00:36:26 +0000
Subject: * symbian/README.SYMBIAN: fixed broken patch and converted to  
 unified diff.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog              |   5 +++
 symbian/README.SYMBIAN | 116 ++++++++++++++++++++++---------------------------
 2 files changed, 58 insertions(+), 63 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eeecd69e5a..fb965b6ba0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 15 09:36:22 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* symbian/README.SYMBIAN: fixed broken patch and converted to
+	  unified diff.
+
 Mon Mar 15 07:51:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (Init_File): do not define File::ALT_SEPARATOR on cygwin.
diff --git a/symbian/README.SYMBIAN b/symbian/README.SYMBIAN
index 5e31e47702..5b500e3234 100644
--- a/symbian/README.SYMBIAN
+++ b/symbian/README.SYMBIAN
@@ -8,68 +8,58 @@
 
     Note: if you want to build dynamic extensions support you need to install the latest version of GCC compiler from http://www.codesourcery.com/gnu_toolchains/arm/portal/release643. After that you need to apply a patch below to a header file (SDK_ROOT)\epoc32\include\gcce\gcce.h
 
-11c11
-<
----
-> @released
-18a19
->
-21a23
->
-24a27,29
-> #define IMPORT_D __declspec(dllimport)
-> #define EXPORT_D __declspec(dllexport)
->
-81,82c86,87
-< #define __NAKED__ __asm
-< #define ____ONLY_USE_NAKED_IN_CIA____ __asm
----
-> #define __NAKED__ __declspec(naked)
-> #define ____ONLY_USE_NAKED_IN_CIA____ __declspec(naked)
-92,96c97,98
-<     namespace std {
-<         extern "C" {
-< #endif  /* __cplusplus */
-<
-< typedef struct __va_list { void *__ap; } va_list;
----
->     namespace std { extern "C" {
-> #endif
-97a100,104
->     #if __GNUC__ < 4
->     typedef struct __va_list { void *__ap; } va_list;
->     #else
->     typedef __builtin_va_list va_list;
->     #endif
-100,102c107
-< 	}  /* extern "C" */
-<     }  /* namespace std */
-<
----
-> 	} }
-105a111
-> #if __GNUC__ < 4
-107,109c113,119
-< #define va_arg(ap, type) __builtin_va_arg(ap.__ap, type)
-< #define va_end(ap) __builtin_va_end(ap.__ap)
-<
----
-> #define va_arg(ap, type)    __builtin_va_arg(ap.__ap, type)
-> #define va_end(ap)          __builtin_va_end(ap.__ap)
-> #else
-> #define va_start(ap, parmN) __builtin_va_start(ap, parmN)
-> #define va_arg(ap, type)    __builtin_va_arg(ap, type)
-> #define va_end(ap)          __builtin_va_end(ap)
-> #endif
-140,141c150,152
-< // Deal with operator new issues here
-< #include "../symcpp.h"
----
-> #ifndef __SYMBIAN_STDCPP_SUPPORT__
-> 	#include "../symcpp.h"
-> #endif
-151a163
->
+===================================================================
+--- Epoc32/include/gcce/gcce.h
++++ Epoc32/include/gcce/gcce.h
+@@ -22,4 +22,6 @@
+ #define IMPORT_C __declspec(dllimport) 
+ #define EXPORT_C __declspec(dllexport)
++#define IMPORT_D __declspec(dllimport)
++#define EXPORT_D __declspec(dllexport)
+ 
+ 
+@@ -79,6 +81,6 @@
+ 
+ // __NAKED__ from cpudefs.h
+-#define __NAKED__ __asm
+-#define ____ONLY_USE_NAKED_IN_CIA____ __asm
++#define __NAKED__ __declspec(naked)
++#define ____ONLY_USE_NAKED_IN_CIA____ __declspec(naked)
+ 
+ // Int64 and Uint64 from nkern\nklib.h
+@@ -94,5 +96,9 @@
+ #endif  /* __cplusplus */
+ 
++#if __GNUC__ < 4
+ typedef struct __va_list { void *__ap; } va_list;
++#else
++typedef __builtin_va_list va_list;
++#endif
+ 
+ 
+@@ -104,7 +110,13 @@
+ #endif
+ 
++#if __GNUC__ < 4
+ #define va_start(ap, parmN) __builtin_va_start(ap.__ap, parmN)
+ #define va_arg(ap, type) __builtin_va_arg(ap.__ap, type)
+ #define va_end(ap) __builtin_va_end(ap.__ap)
++#else
++#define va_start(ap, parmN) __builtin_va_start(ap, parmN)
++#define va_arg(ap, type) __builtin_va_arg(ap, type)
++#define va_end(ap) __builtin_va_end(ap)
++#endif
+ 
+ 
+@@ -139,5 +151,7 @@
+ 
+ // Deal with operator new issues here
++#ifndef __SYMBIAN_STDCPP_SUPPORT__
+ #include "..\symcpp.h"
++#endif
+ 
+ #ifdef __cplusplus
+===================================================================
 
 
 (2) If you want to build from SVN source, following command line binaries are required that are not a part of Symbain SDK.
@@ -90,7 +80,7 @@
 
 (3) Run 'makesis ruby.pkg' from symbian\sis directory
      This command will create unsigned installation file ruby.sis. To sign it follow the guidlines from www.symbiansigned.com
-     
+
 (4) In case dynamic extensions support was enabled repeat (3) for ruby_core_ext.pkg
 
 == Known problems
-- 
cgit v1.2.3