r17188 by jghali - small win32 specific fixes for cairo private copy

[scribus-commit]

Author: jghali
Date: Sun Jan  8 18:26:02 2012
New Revision: 17188

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17188
Log:
small win32 specific fixes for cairo private copy

Modified:
    trunk/Scribus/scribus/third_party/cairo/cairo-win32-surface.c
    trunk/Scribus/win32/vc9/scribus-cairo/scribus-cairo.vcproj

Modified: trunk/Scribus/scribus/third_party/cairo/cairo-win32-surface.c
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17188&path=/trunk/Scribus/scribus/third_party/cairo/cairo-win32-surface.c
==============================================================================
--- trunk/Scribus/scribus/third_party/cairo/cairo-win32-surface.c (original)
+++ trunk/Scribus/scribus/third_party/cairo/cairo-win32-surface.c Sun Jan  8 18:26:02 2012
@@ -94,14 +94,16 @@
 			 NULL,
 			 last_error,
 			 MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
-			 (LPSTR) &lpMsgBuf,
+			 (LPWSTR) &lpMsgBuf,
 			 0, NULL)) {
 	fprintf (stderr, "%s: Unknown GDI error", context);
     } else {
-	fwprintf (stderr, "%S: %s", context, (char *)lpMsgBuf);
+	fprintf (stderr, "%s: %S", context, (wchar_t *)lpMsgBuf);
 
 	LocalFree (lpMsgBuf);
     }
+
+	fflush (stderr);
 
     /* We should switch off of last_status, but we'd either return
      * CAIRO_STATUS_NO_MEMORY or CAIRO_STATUS_UNKNOWN_ERROR and there

Modified: trunk/Scribus/win32/vc9/scribus-cairo/scribus-cairo.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17188&path=/trunk/Scribus/win32/vc9/scribus-cairo/scribus-cairo.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/scribus-cairo/scribus-cairo.vcproj (original)
+++ trunk/Scribus/win32/vc9/scribus-cairo/scribus-cairo.vcproj Sun Jan  8 18:26:02 2012
@@ -51,7 +51,6 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				CompileAs="1"
 				DisableSpecificWarnings="4018;4100;4127;4244;4550;4996"
@@ -137,7 +136,6 @@
 				FloatingPointModel="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				CompileAs="1"
 				DisableSpecificWarnings="4018;4100;4127;4244;4550;4996"