IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 31636 for trunk/Ohana


Ignore:
Timestamp:
Jun 16, 2011, 12:17:32 PM (15 years ago)
Author:
bills
Message:

move declaration of GetGraphdata from dvo.h to it's own header file to avoid needing to
include kapa.h in dvo.h. Doing that caused problems in psLib

Location:
trunk/Ohana/src
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/libdvo/Makefile

    r31635 r31636  
    3636$(DESTINC)/ps1_ref_defs.h
    3737
    38 INCS = $(DEFS) $(DESTINC)/dvo.h $(DESTINC)/autocode.h $(DESTINC)/dvo_util.h $(DESTINC)/dvodb.h $(DESTINC)/libdvo_astro.h $(DESTINC)/convert.h
     38INCS = $(DEFS) $(DESTINC)/dvo.h $(DESTINC)/autocode.h $(DESTINC)/dvo_util.h $(DESTINC)/dvodb.h $(DESTINC)/libdvo_astro.h $(DESTINC)/convert.h $(DESTINC)/get_graphdata.h
    3939
    4040OBJS = \

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

    r31635 r31636  
    11# ifndef DVODB_H
    22# define DVODB_H
    3 
    4 // to get definition of Graphdata
    5 # include "kapa.h"
    63
    74typedef enum {
    … …  
    333330#define opihi_int int
    334331
    335 int GetGraphdata PROTO((Graphdata *data, int *kapa, char *name));
    336 
    337332# endif

  • trunk/Ohana/src/libdvo/src/ImageOps.c

    r31635 r31636  
    11# include "dvo.h"
    22# include "dvodb.h"
     3# include "get_graphdata.h"
    34
    45void image_subset (Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset,

  • trunk/Ohana/src/libdvo/src/dbCmdlineFields.c

    r31635 r31636  
    11# include "dvo.h"
     2# include "get_graphdata.h"
    23
    34// check for 'where' or 'matched to'; return first field after the word, and the value

  • trunk/Ohana/src/libdvo/src/db_utils.c

    r31635 r31636  
    11# include "dvo.h"
     2# include "get_graphdata.h"
    23
    34// This file contains some functions used by the libdvo db lookup functions

  • trunk/Ohana/src/opihi/include/data.h

    r29540 r31636  
    44# include "convert.h"
    55# include "display.h"
     6# include "get_graphdata.h"
    67
    78# ifndef DATA_H

  • trunk/Ohana/src/opihi/include/display.h

    r27435 r31636  
    1111int           PlotVectorPairErrors  PROTO((int kapa, Vector *xVec, Vector *yVec, Vector *dyValues, Graphdata *graphmode));
    1212int           PlotVectorTriplet     PROTO((int kapa, Vector *xVec, Vector *yVec, Vector *zValues, Graphdata *graphmode));
    13 int           GetGraphData          PROTO((Graphdata *data, int *kapa, char *name));
     13// int           GetGraphData          PROTO((Graphdata *data, int *kapa, char *name));
    1414int           GetGraph              PROTO((Graphdata *data, int *kapa, char *name));
    1515int           SetGraph              PROTO((Graphdata *data));
Note: See TracChangeset for help on using the changeset viewer.