Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/libemf/patches/libEMF-1.0-amd64.patch

    Contents of /trunk/libemf/patches/libEMF-1.0-amd64.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 144 - (show annotations) (download)
    Tue May 8 20:06:05 2007 UTC (17 years ago) by niro
    File size: 2362 byte(s) 
    -import
    1 diff -dur libEMF-1.0.orig/include/wine/winnt.h libEMF-1.0/include/wine/winnt.h
    2 --- libEMF-1.0.orig/include/wine/winnt.h 2002-01-29 05:31:53.000000000 +0100
    3 +++ libEMF-1.0/include/wine/winnt.h 2004-01-22 14:22:35.382239593 +0100
    4 @@ -45,6 +45,10 @@
    5 # undef WORDS_BIGENDIAN
    6 # undef BITFIELDS_BIGENDIAN
    7 # undef ALLOW_UNALIGNED_ACCESS
    8 +#elif defined(__x86_64__)
    9 +# undef WORDS_BIGENDIAN
    10 +# undef BITFIELDS_BIGENDIAN
    11 +# define ALLOW_UNALIGNED_ACCESS
    12 #elif !defined(RC_INVOKED)
    13 # error Unknown CPU architecture!
    14 #endif
    15 @@ -211,7 +215,7 @@
    16 typedef unsigned short WORD, *PWORD, *LPWORD;
    17 typedef int INT, *PINT, *LPINT;
    18 typedef unsigned int UINT, *PUINT, *LPUINT;
    19 -#if !defined(__alpha__)
    20 +#if !defined(__alpha__) && !defined(__x86_64__)
    21 typedef unsigned long DWORD, *PDWORD, *LPDWORD;
    22 typedef unsigned long ULONG, *PULONG, *LPULONG;
    23 #else /* defined( __alpha__ ) */
    24 @@ -257,7 +261,7 @@
    25 typedef BYTE BOOLEAN, *PBOOLEAN;
    26 typedef char CHAR, *PCHAR;
    27 typedef short SHORT, *PSHORT;
    28 -#if !defined(__alpha__)
    29 +#if !defined(__alpha__) && !defined(__x86_64__)
    30 typedef long LONG, *PLONG, *LPLONG;
    31 #else /* defined( __alpha__ ) */
    32 typedef int LONG, *PLONG, *LPLONG;
    33 @@ -1045,6 +1049,11 @@
    34
    35 #endif /* __sparc__ */
    36
    37 +#if defined(__x86_64__)
    38 +#define CONTEXT_FULL 1
    39 +typedef struct _CONTEXT CONTEXT;
    40 +#endif
    41 +
    42 #if !defined(CONTEXT_FULL) && !defined(RC_INVOKED)
    43 #error You need to define a CONTEXT for your CPU
    44 #endif
    45 diff -dur libEMF-1.0.orig/libemf/libemf.h libEMF-1.0/libemf/libemf.h
    46 --- libEMF-1.0.orig/libemf/libemf.h 2002-01-29 05:54:27.000000000 +0100
    47 +++ libEMF-1.0/libemf/libemf.h 2004-01-22 14:23:14.315813724 +0100
    48 @@ -332,7 +332,7 @@
    49 fread( &dword, sizeof(DWORD), 1, fp_ );
    50 return *this;
    51 }
    52 -#if !defined(__alpha__)
    53 +#if !defined(__alpha__) && !defined(__x86_64__)
    54 /*!
    55 * Output a long int to the stream (swabbed).
    56 * \param long long int to output.
    57 @@ -402,7 +402,7 @@
    58 fread( &int_, sizeof(INT), 1, fp_ );
    59 return *this;
    60 }
    61 -#if !defined(__alpha__)
    62 +#if !defined(__alpha__) && !defined(__x86_64__)
    63 /*!
    64 * Output a (long) unsigned int to the stream (swabbed).
    65 * \param uint (long) unsigned int to output.
    66 Only in libEMF-1.0/libemf: libemf.h~