[csw-devel] SF.net SVN: gar:[11697] csw/mgar/pkg/libemf/trunk/files/ 0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch

[dmichelsen at users.sourceforge.net]

Revision: 11697
          http://gar.svn.sourceforge.net/gar/?rev=11697&view=rev
Author:   dmichelsen
Date:     2010-11-23 13:41:15 +0000 (Tue, 23 Nov 2010)

Log Message:
-----------
libemf: Adjust patch for i386

Modified Paths:
--------------
    csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch

Modified: csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch
===================================================================
--- csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch	2010-11-23 13:25:21 UTC (rev 11696)
+++ csw/mgar/pkg/libemf/trunk/files/0001-Add-__sparc-and-__i386-in-addition-to-__-__.patch	2010-11-23 13:41:15 UTC (rev 11697)
@@ -1,14 +1,14 @@
-From ce43acc3cf6e579264d7333221deb7c81bb29b54 Mon Sep 17 00:00:00 2001
+From 1df10ad110f4661217c2f68bbfbdcaa7b1cde2cf Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 22 Nov 2010 16:51:08 +0100
+Date: Tue, 23 Nov 2010 14:37:55 +0100
 Subject: [PATCH] Add __sparc and __i386 in addition to __*__
 
 ---
- include/libEMF/wine/winnt.h |   18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
+ include/libEMF/wine/winnt.h |   21 +++++++++++----------
+ 1 files changed, 11 insertions(+), 10 deletions(-)
 
 diff --git a/include/libEMF/wine/winnt.h b/include/libEMF/wine/winnt.h
-index a455290..5aed45f 100644
+index a455290..b052679 100644
 --- a/include/libEMF/wine/winnt.h
 +++ b/include/libEMF/wine/winnt.h
 @@ -29,11 +29,11 @@
@@ -34,7 +34,17 @@
  # ifndef _X86_
  #  define _X86_
  # endif
-@@ -639,7 +639,7 @@ typedef struct _CONTEXT86
+@@ -56,7 +56,8 @@
+ #  define __stdcall __attribute__((__stdcall__))
+ #  define __cdecl   __attribute__((__cdecl__))
+ # else
+-#  error You need gcc >= 2.7 to build Wine on a 386
++#  define __stdcall
++#  define __cdecl
+ # endif  /* __GNUC__ */
+ #else  /* __i386__ */
+ # define __stdcall
+@@ -639,7 +640,7 @@ typedef struct _CONTEXT86
  #define CONTEXT86_FULL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS)
  
  /* i386 context definitions */
@@ -43,7 +53,7 @@
  
  #define CONTEXT_CONTROL         CONTEXT86_CONTROL
  #define CONTEXT_INTEGER         CONTEXT86_INTEGER
-@@ -969,7 +969,7 @@ typedef struct _STACK_FRAME_HEADER
+@@ -969,7 +970,7 @@ typedef struct _STACK_FRAME_HEADER
  
  #endif  /* __PPC__ */
  
@@ -52,7 +62,7 @@
  
  /* 
   * FIXME:  
-@@ -1138,7 +1138,7 @@ typedef CONTEXT *PCONTEXT;
+@@ -1138,7 +1139,7 @@ typedef CONTEXT *PCONTEXT;
  
  #endif  /* __i386__ */
  
@@ -61,7 +71,7 @@
  /* FIXME: use getcontext() to retrieve full context */
  #define _GET_CONTEXT \
      CONTEXT context;   \
-@@ -1204,7 +1204,7 @@ typedef CONTEXT *PCONTEXT;
+@@ -1204,7 +1205,7 @@ typedef CONTEXT *PCONTEXT;
      static void func(void) __attribute__((constructor)); \
      static void func(void)
  #else  /* __GNUC__ */
@@ -70,7 +80,7 @@
  #  define DECL_GLOBAL_CONSTRUCTOR(func) \
      static void __dummy_init_##func(void) { \
          asm(".section .init,\"ax\"\n\t" \
-@@ -1218,7 +1218,7 @@ typedef CONTEXT *PCONTEXT;
+@@ -1218,7 +1219,7 @@ typedef CONTEXT *PCONTEXT;
  
  /* Segment register access */
  
@@ -79,7 +89,7 @@
  # ifdef __GNUC__
  #  define __DEFINE_GET_SEG(seg) \
      extern inline unsigned short __get_##seg(void) \
-@@ -2347,7 +2347,7 @@ typedef struct _NT_TIB
+@@ -2347,7 +2348,7 @@ typedef struct _NT_TIB
  
  struct _TEB;
  


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.