Changeset 31647

Timestamp:

Jun 17, 2011, 1:02:59 PM (15 years ago)

Author:

bills

Message:

fix circular dependency in header files by moving the declaration of struct Graphdata to libdvo

Location:

trunk/Ohana/src

Files:

• libdvo/include/dvodb.h (modified) (1 diff)
• libdvo/include/get_graphdata.h (modified) (1 diff)
• libkapa/include/kapa.h (modified) (2 diffs)

trunk/Ohana/src/libdvo/include/dvodb.h

@@ -330 +330 @@
 #define opihi_int int
 
+#include "get_graphdata.h"
+
 # endif

trunk/Ohana/src/libdvo/include/get_graphdata.h

@@ -2 +2 @@
 #define GET_GRAPHDATA_H
 
-#include "kapa.h"
+// This was moved from kapa.h
+
+typedef struct graphdata {
+  double xmin, xmax, ymin, ymax;
+  int style, ptype, ltype, etype, ebar, color;
+  double lweight, size;
+  double ticktextPad;
+  double labelPadXm, labelPadYm, labelPadXp, labelPadYp;
+  double padXm, padXp, padYm, padYp;
+  Coords coords;
+  int flipeast, flipnorth;
+  char axis[8], labels[8], ticks[8];
+} Graphdata;
+
 
 int GetGraphdata PROTO((Graphdata *data, int *kapa, char *name));

trunk/Ohana/src/libkapa/include/kapa.h

@@ -85 +85 @@
 } KapaSection;
 
-typedef struct {
+#ifdef NOT_MOVED_TO_DVO
+typedef struct graphdata {
   double xmin, xmax, ymin, ymax;
   int style, ptype, ltype, etype, ebar, color;
@@ -96 +97 @@
   char axis[8], labels[8], ticks[8];
 } Graphdata;
+#endif
 
 typedef struct {