r16283 by jghali - fix warning when compiling with msvc

scribus-commit scribus-commit at lists.scribus.net
Wed Jan 19 18:17:30 CET 2011


Author: jghali
Date: Wed Jan 19 17:17:30 2011
New Revision: 16283

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16283
Log:
fix warning when compiling with msvc

Modified:
    branches/ScribusOIF/scribus/third_party/harfbuzz/src/hb-private.h
    branches/ScribusOIF/win32/vc9/scribus-harfbuzz/scribus-harbuzz.vcproj

Modified: branches/ScribusOIF/scribus/third_party/harfbuzz/src/hb-private.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16283&path=/branches/ScribusOIF/scribus/third_party/harfbuzz/src/hb-private.h
==============================================================================
--- branches/ScribusOIF/scribus/third_party/harfbuzz/src/hb-private.h (original)
+++ branches/ScribusOIF/scribus/third_party/harfbuzz/src/hb-private.h Wed Jan 19 17:17:30 2011
@@ -211,7 +211,7 @@
 #else
 
 #ifdef _MSC_VER
-#pragma message(__LOC__"Could not find any system to define platform macros, library will NOT be thread-safe")
+#pragma message(_HB__LOC__"Could not find any system to define platform macros, library will NOT be thread-safe")
 #else
 #warning "Could not find any system to define platform macros, library will NOT be thread-safe"
 #endif

Modified: branches/ScribusOIF/win32/vc9/scribus-harfbuzz/scribus-harbuzz.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16283&path=/branches/ScribusOIF/win32/vc9/scribus-harfbuzz/scribus-harbuzz.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/scribus-harfbuzz/scribus-harbuzz.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/scribus-harfbuzz/scribus-harbuzz.vcproj Wed Jan 19 17:17:30 2011
@@ -271,6 +271,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\scribus\third_party\harfbuzz\src\hb-object-private.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\scribus\third_party\harfbuzz\src\hb-ot-layout.h"
 				>
 			</File>
@@ -313,10 +317,6 @@
 		</Filter>
 		<File
 			RelativePath="..\..\..\scribus\third_party\harfbuzz\src\hb-buffer-private.hh"
-			>
-		</File>
-		<File
-			RelativePath="..\..\..\scribus\third_party\harfbuzz\src\hb-object-private.h"
 			>
 		</File>
 		<File




More information about the scribus-commit mailing list