[pango] Bug 653985 - Pango 1.29.x make GTK3-demo.exe crashed in Windows



commit 552ffc23118960bc598d6bd83db6661fe4bbf63b
Author: Behdad Esfahbod <behdad behdad org>
Date:   Mon Jul 11 22:24:49 2011 -0400

    Bug 653985 - Pango 1.29.x make GTK3-demo.exe crashed in Windows
    
    Similar to d9e254f which changed the rest of the modules, moved the
    PANGO_MODULE_PREFIX define from basic-win32.c to the VS9 project file to
    avoid breaking autotools build.
    
    Fixes basic-win32 module loading when pango is built with autotools +
    MinGW.

 build/win32/vs9/pangowin32.vcproj |   11 ++++++++++-
 modules/basic/basic-win32.c       |    4 ----
 2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/build/win32/vs9/pangowin32.vcproj b/build/win32/vs9/pangowin32.vcproj
index ce34ae7..b2a05b1 100644
--- a/build/win32/vs9/pangowin32.vcproj
+++ b/build/win32/vs9/pangowin32.vcproj
@@ -283,7 +283,16 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File RelativePath="..\..\..\modules\basic\basic-win32.c" />
+			<File RelativePath="..\..\..\modules\basic\basic-win32.c" >
+				<FileConfiguration Name="Debug_FC|Win32"><Tool Name="VCCLCompilerTool"	PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_win32" /></FileConfiguration>
+				<FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool"	PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_win32" /></FileConfiguration>
+				<FileConfiguration Name="Release_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_win32" /></FileConfiguration>
+				<FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_win32" /></FileConfiguration>
+				<FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_win32" /></FileConfiguration>
+				<FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_win32" /></FileConfiguration>
+				<FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_win32" /></FileConfiguration>
+				<FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_win32" /></FileConfiguration>
+			</File>
 			<File RelativePath="..\..\..\pango\module-defs-win32.c" />
 			<File RelativePath="..\..\..\pango\pangowin32-fontcache.c" />
 			<File RelativePath="..\..\..\pango\pangowin32-fontmap.c" />
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c
index 7a27d50..810d2a2 100644
--- a/modules/basic/basic-win32.c
+++ b/modules/basic/basic-win32.c
@@ -33,10 +33,6 @@
 
 extern HFONT _pango_win32_font_get_hfont (PangoFont *font);
 
-#ifndef PANGO_MODULE_PREFIX
-#define PANGO_MODULE_PREFIX _pango_basic_win32
-#endif
-
 #include "pango-engine.h"
 #include "pango-utils.h"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]