attempt to fix potential windows breakage

diff --git a/graphviz.vcproj b/graphviz.vcproj
index d6d15146e894789b92d09fbf6d972e23cab7e102..4360ce9ec1509c74c3a1d37751cced7d196201c6 100644 (file)
--- a/graphviz.vcproj
+++ b/graphviz.vcproj
@@ -667,7 +667,7 @@
                                >
                        </File>
                        <File
-                               RelativePath=".\lib\common\fontmetrics.c"
+                               RelativePath=".\lib\common\textspan.c"
                                >
                        </File>
                        <File

diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index 27c16cd71d3c5eb58257649a912765525af83a23..27b5ed02d58ee6f575f6f4b7c8699cb347d7ac84 100644 (file)
--- a/lib/common/Makefile.am
+++ b/lib/common/Makefile.am
@@ -25,7 +25,7 @@ noinst_HEADERS = render.h utils.h memory.h \
        logic.h const.h macros.h htmllex.h htmltable.h pointset.h intset.h
 noinst_LTLIBRARIES = libcommon_C.la
 
-libcommon_C_la_SOURCES = arrows.c colxlate.c ellipse.c textfont.c \
+libcommon_C_la_SOURCES = arrows.c colxlate.c ellipse.c textspan.c \
        args.c memory.c globals.c htmllex.c htmlparse.y htmltable.c input.c \
        pointset.c intset.c postproc.c routespl.c splines.c psusershape.c \
        timing.c labels.c ns.c shapes.c utils.c geom.c taper.c \

diff --git a/lib/common/textfont.c b/lib/common/textspan.c
similarity index 100%
rename from lib/common/textfont.c
rename to lib/common/textspan.c

diff --git a/lib/gvc.def b/lib/gvc.def
index ec36b4ea5b8a4dcb0c7995a2cd77aa3509c037a0..f8d9c2743d899a40ceb3b096207aec4cf7c219b9 100644 (file)
--- a/lib/gvc.def
+++ b/lib/gvc.def
@@ -254,7 +254,8 @@ Ndim
 neato_closest    
 new_queue    
 new_spline    
-new_textfont
+textfont_dict_open
+textfont_dict_close
 newPM    
 newPS    
 nodeInduce    

diff --git a/lib/gvc.vcproj b/lib/gvc.vcproj
index 6eb40393caf8b69bec874f2fe8a6a43c84ab12e6..9aa27193377dbed7b2cd3f91252ec722406b5cbb 100644 (file)
--- a/lib/gvc.vcproj
+++ b/lib/gvc.vcproj
@@ -265,7 +265,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\common\textpara.h"\r
+                               RelativePath=".\common\textspan.h"\r
                                >\r
                        </File>\r
                        <File\r