moved struct def of pstream_t into pstream.h, moved def of varlist_t into its own file

src/Makefile.am

@@ -162,6 +162,7 @@ libcdo_la_SOURCES =            \
                uthash.h        \
                util.cc          \
                util.h          \
+			   varlist.h		\
                zaxis_print.cc   \
                zaxis.cc
 libcdo_la_SOURCES +=           \

src/pipe.h

@@ -29,44 +29,10 @@
 
 #include <pthread.h>
 #include "pthread_debug.h"
+#include "pstream.h"
 
 #endif
 
-typedef struct {
-  bool        check_datarange;
-  int         gridsize;
-  int         datatype;
-  double      missval;
-  double      addoffset;
-  double      scalefactor;
-} varlist_t;
-
-
-typedef struct {
-  int            self;
-  int            mode;
-  int            fileID;
-  int            vlistID;
-  int            tsID;
-  int            filetype;
-  int            tsID0;
-  int            mfiles;
-  int            nfiles;
-  int            varID;           /* next varID defined with streamDefVar */
-  bool           ispipe;
-  bool           isopen;
-  char          *name;
-  char         **mfnames;
-  varlist_t     *varlist;
-#if defined(HAVE_LIBPTHREAD)
-  void          *argument;
-  struct pipe_s *pipe;
-  pthread_t     rthreadID; /* read  thread ID */
-  pthread_t     wthreadID; /* write thread ID */
-#endif
-} pstream_t;
-
-
 #if defined(HAVE_LIBPTHREAD)
 
 struct pipe_s {

src/pstream.h

@@ -19,9 +19,34 @@
 #define PSTREAM_H
 
 #include "pstream_write.h"
+#include "varlist.h"
 
 #include <sys/types.h> /* off_t */
 
+typedef struct {
+  int            self;
+  int            mode;
+  int            fileID;
+  int            vlistID;
+  int            tsID;
+  int            filetype;
+  int            tsID0;
+  int            mfiles;
+  int            nfiles;
+  int            varID;           /* next varID defined with streamDefVar */
+  bool           ispipe;
+  bool           isopen;
+  char          *name;
+  char         **mfnames;
+  varlist_t     *varlist;
+#if defined(HAVE_LIBPTHREAD)
+  void          *argument;
+  struct pipe_s *pipe;
+  pthread_t     rthreadID; /* read  thread ID */
+  pthread_t     wthreadID; /* write thread ID */
+#endif
+} pstream_t;
+
 int     pstreamOpenRead(const argument_t *argument);
 int     pstreamOpenAppend(const argument_t *argument);
 void    pstreamClose(int pstreamID);

src/varlist.h

+#ifndef VARLIST_H
+#define VARLIST_H
+
+typedef struct {
+  bool        check_datarange;
+  int         gridsize;
+  int         datatype;
+  double      missval;
+  double      addoffset;
+  double      scalefactor;
+} varlist_t;
+
+#endif