another possible fix for fror and raptor + tcldot fix

diff --git a/.gitignore b/.gitignore
index ceb14c46966360a7492d3d6fc3a0382739094c25..1a3e312bde6f5e91e02b7265471d81f3a00a62e1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -133,6 +133,7 @@ tclpkg/gv/gv_ruby.cpp
 tclpkg/gv/gv_tcl.cpp
 tclpkg/gv/php_gv.h
 tclpkg/gv/pkgIndex.tcl
+tclpkg/gv/test_*
 tclpkg/pkgIndex.tcl
 tclpkg/tcldot/pkgIndex.tcl
 tclpkg/tclpathplan/pkgIndex.tcl

diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c
index 3309c5b9ade0782f6cf8ea496a445aee65a2bcc2..73accfe439e8a7823a3beadca987e0e51afaacc9 100644 (file)
--- a/lib/gvc/gvrender.c
+++ b/lib/gvc/gvrender.c
@@ -75,6 +75,8 @@ int gvrender_select(GVJ_t * job, char *str)
        if (strcmp(plugin->packagename, "cg") == 0) {
            cg_info = (codegen_info_t *) (plugin->typeptr);
            job->codegen = cg_info->cg;
+           job->render.engine = NULL;
+           job->device.engine = NULL;
            return cg_info->id;
        } else {
 #endif

diff --git a/tclpkg/gv/gv.cpp b/tclpkg/gv/gv.cpp
index 7dd3dd27c7cf1fccb8042b1b8385dfa7155c8551..31e2636183084ad20c72b5ea9b14ac48ff324f2e 100644 (file)
--- a/tclpkg/gv/gv.cpp
+++ b/tclpkg/gv/gv.cpp
@@ -14,8 +14,8 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
+#define BUILTINS
 #include "gvc.h"
-#include "graph.h"
 
 GVC_t *gvc;
 

diff --git a/tclpkg/gv/gv.i b/tclpkg/gv/gv.i
index f40735d44616ce1a71cf4e60ef7a0319201b23a5..8c7f9b17eee4a9d422bcbf9bdf6cdf7b2fee0159 100644 (file)
--- a/tclpkg/gv/gv.i
+++ b/tclpkg/gv/gv.i
@@ -16,7 +16,6 @@
 
 %module gv
 %{
-#define BUILTINS
 #include "gvc.h"
 %}
 

diff --git a/tclpkg/tcldot/tcldot.c b/tclpkg/tcldot/tcldot.c
index 28011fda0948c5f6dd66422081868f26ec6f4001..f274f2788a448a9075e76514c6b16669b803c28c 100644 (file)
--- a/tclpkg/tcldot/tcldot.c
+++ b/tclpkg/tcldot/tcldot.c
@@ -18,8 +18,6 @@
 /* avoid compiler warnings with template changes in Tcl8.4 */
 /*    specifically just the change to Tcl_CmdProc */
 #define USE_NON_CONST
-#define BUILTINS
-
 #include "render.h"
 #include "gvc.h"
 #include "tcl.h"