[csw-devel] SF.net SVN: gar:[8217] csw/mgar/pkg/libfpx/trunk

hson at users.sourceforge.net hson at users.sourceforge.net
Fri Jan 29 10:18:43 CET 2010


Revision: 8217
          http://gar.svn.sourceforge.net/gar/?rev=8217&view=rev
Author:   hson
Date:     2010-01-29 09:18:43 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
libfpx: Sun Studio compile problems fixed

Modified Paths:
--------------
    csw/mgar/pkg/libfpx/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/libfpx/trunk/files/tchar.patch

Modified: csw/mgar/pkg/libfpx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfpx/trunk/Makefile	2010-01-29 08:06:06 UTC (rev 8216)
+++ csw/mgar/pkg/libfpx/trunk/Makefile	2010-01-29 09:18:43 UTC (rev 8217)
@@ -32,7 +32,7 @@
 SPKG_SOURCEURL = http://www.imagemagick.org
 
 PATCHFILES = olecomm.h.patch
-#PATCHFILES += tchar.patch
+PATCHFILES += tchar.patch
 
 LICENSE = flashpix.h
 
@@ -49,6 +49,6 @@
 BUILD64 = 1
 
 # libfpx have some problems with rw/trait
-GARCOMPILER = GCC4
+#GARCOMPILER = GCC4
 
 include gar/category.mk

Added: csw/mgar/pkg/libfpx/trunk/files/tchar.patch
===================================================================
--- csw/mgar/pkg/libfpx/trunk/files/tchar.patch	                        (rev 0)
+++ csw/mgar/pkg/libfpx/trunk/files/tchar.patch	2010-01-29 09:18:43 UTC (rev 8217)
@@ -0,0 +1,45 @@
+diff -Nru libfpx-1.3.0.orig/oless/h/tchar.h libfpx-1.3.0/oless/h/tchar.h
+--- libfpx-1.3.0.orig/oless/h/tchar.h	2002-02-08 02:04:15.000000000 +0100
++++ libfpx-1.3.0/oless/h/tchar.h	2010-01-05 01:51:56.302027510 +0100
+@@ -78,7 +78,7 @@
+ #define _tcsnicmp _strnicmp
+ #define _tcscat   strcat
+ #define _itot     _itoa
+-#define _T(str)   str
++#define OLE_TEXT(str)   str
+ 
+ #ifdef _WIN32
+ 
+@@ -125,7 +125,7 @@
+ #define _tcscat   wcscat
+ #define _tcsnicmp wcsnicmp
+ #define _itot     _itow
+-#define _T(str)   L##str
++#define OLE_TEXT(str)   L##str
+ 
+ /* Io functions */
+ #define _tfopen    _wfopen
+diff -Nru libfpx-1.3.0.orig/oless/props/h/windef.h libfpx-1.3.0/oless/props/h/windef.h
+--- libfpx-1.3.0.orig/oless/props/h/windef.h	2007-11-02 08:10:05.000000000 +0100
++++ libfpx-1.3.0/oless/props/h/windef.h	2010-01-05 01:53:25.581245781 +0100
+@@ -60,7 +60,7 @@
+ #include <assert.h>
+ #define Win4Assert assert
+ 
+-#define TEXT(x) _T(x)
++#define TEXT(x) OLE_TEXT(x)
+ 
+ /* memory manupulation routines */
+ #define RtlCopyMemory(dest,src,count)    memcpy(dest, src, count)
+diff -Nru libfpx-1.3.0.orig/oless/test/stgdrt/drt.hxx libfpx-1.3.0/oless/test/stgdrt/drt.hxx
+--- libfpx-1.3.0.orig/oless/test/stgdrt/drt.hxx	2002-02-08 20:23:42.000000000 +0100
++++ libfpx-1.3.0/oless/test/stgdrt/drt.hxx	2010-01-05 01:53:30.320886391 +0100
+@@ -34,7 +34,7 @@
+ #define EXIT_OOM 2
+ #define EXIT_UNKNOWN 3
+ 
+-#define STR(x) _T(x)
++#define STR(x) OLE_TEXT(x)
+ 
+ #ifdef _UNICODE
+ #ifndef ATOT


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


More information about the devel mailing list