From 041857de23d74b08a9c7b04c6a0a78e1f1ecd69c Mon Sep 17 00:00:00 2001
From: Olivier Couet <Olivier.Couet@cern.ch>
Date: Fri, 5 Apr 2013 13:21:22 +0000
Subject: [PATCH] Move #include <gvc.h> from the .cxx to the .h files. That way
 we are compatible with the old and new graphviz.

git-svn-id: http://root.cern.ch/svn/root/trunk@49096 27541ba8-7e3a-0410-8455-c3a389f83636
---
 graf2d/gviz/Module.mk            | 2 +-
 graf2d/gviz/inc/TGraphEdge.h     | 5 ++---
 graf2d/gviz/inc/TGraphNode.h     | 4 +---
 graf2d/gviz/inc/TGraphStruct.h   | 3 +--
 graf2d/gviz/src/TGraphEdge.cxx   | 2 --
 graf2d/gviz/src/TGraphNode.cxx   | 2 --
 graf2d/gviz/src/TGraphStruct.cxx | 1 -
 7 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/graf2d/gviz/Module.mk b/graf2d/gviz/Module.mk
index b36eaa1ed01..c1fbae6f5af 100644
--- a/graf2d/gviz/Module.mk
+++ b/graf2d/gviz/Module.mk
@@ -49,7 +49,7 @@ $(GVIZLIB):     $(GVIZO) $(GVIZDO) $(ORDER_) $(MAINLIBS) $(GVIZLIBDEP)
 $(GVIZDS):      $(GVIZH) $(GVIZL) $(ROOTCINTTMPDEP)
 		$(MAKEDIR)
 		@echo "Generating dictionary $@..."
-		$(ROOTCINTTMP) -f $@ -c $(GVIZH) $(GVIZL)
+		$(ROOTCINTTMP) -f $@ -c $(GRAPHVIZINCDIR:%=-I%) $(GVIZH) $(GVIZL)
 
 $(GVIZMAP):     $(RLIBMAP) $(MAKEFILEDEP) $(GVIZL)
 		$(RLIBMAP) -o $@ -l $(GVIZLIB) \
diff --git a/graf2d/gviz/inc/TGraphEdge.h b/graf2d/gviz/inc/TGraphEdge.h
index 0253ebdc9d7..00b8126788e 100644
--- a/graf2d/gviz/inc/TGraphEdge.h
+++ b/graf2d/gviz/inc/TGraphEdge.h
@@ -20,9 +20,8 @@
 #include "TAttLine.h"
 #endif
 
-struct Agraph_t;
-struct Agedge_t;
-class  TGraphNode;
+#include <gvc.h>
+class TGraphNode;
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //
diff --git a/graf2d/gviz/inc/TGraphNode.h b/graf2d/gviz/inc/TGraphNode.h
index 1d9691e46dd..50714db1d32 100644
--- a/graf2d/gviz/inc/TGraphNode.h
+++ b/graf2d/gviz/inc/TGraphNode.h
@@ -28,9 +28,7 @@
 #include "TAttLine.h"
 #endif
 
-struct Agraph_t;
-struct Agnode_t;
-
+#include <gvc.h>
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //
diff --git a/graf2d/gviz/inc/TGraphStruct.h b/graf2d/gviz/inc/TGraphStruct.h
index bddc09939e9..af1dce7be94 100644
--- a/graf2d/gviz/inc/TGraphStruct.h
+++ b/graf2d/gviz/inc/TGraphStruct.h
@@ -25,8 +25,7 @@
 #include "TList.h"
 #endif
 
-struct Agraph_t;
-struct GVC_s;
+#include <gvc.h>
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //
diff --git a/graf2d/gviz/src/TGraphEdge.cxx b/graf2d/gviz/src/TGraphEdge.cxx
index 2a2961ca6c2..27c667161a1 100644
--- a/graf2d/gviz/src/TGraphEdge.cxx
+++ b/graf2d/gviz/src/TGraphEdge.cxx
@@ -15,8 +15,6 @@
 #include "TGraphEdge.h"
 #include "TGraphNode.h"  
 
-#include <gvc.h>
-
 ClassImp(TGraphEdge)
 
 //______________________________________________________________________________
diff --git a/graf2d/gviz/src/TGraphNode.cxx b/graf2d/gviz/src/TGraphNode.cxx
index 9396169470c..e0aa7206ac4 100644
--- a/graf2d/gviz/src/TGraphNode.cxx
+++ b/graf2d/gviz/src/TGraphNode.cxx
@@ -13,8 +13,6 @@
 #include "TEllipse.h"
 #include "TGraphNode.h"
 
-#include <gvc.h>
-
 ClassImp(TGraphNode)
 
 //______________________________________________________________________________
diff --git a/graf2d/gviz/src/TGraphStruct.cxx b/graf2d/gviz/src/TGraphStruct.cxx
index b421a9bb2c8..cdf9aa29cb7 100644
--- a/graf2d/gviz/src/TGraphStruct.cxx
+++ b/graf2d/gviz/src/TGraphStruct.cxx
@@ -15,7 +15,6 @@
 
 #include <stdio.h>
 
-#include <gvc.h>
 #include <gvplugin.h>
 
 #ifdef GVIZ_STATIC
-- 
GitLab