← Back to branch summary

~ubuntu-branches/debian/sid/gdal/sid

« back to all changes in this revision

Viewing changes to ogr/ogrsf_frmts/dods/ogr_dods.h

  • Committer: Package Import Robot
  • Author(s): Francesco Paolo Lovergine
  • Date: 2012-05-07 15:04:42 UTC
  • mfrom: (5.5.16 experimental)
  • Revision ID: package-import@ubuntu.com-20120507150442-2eks97loeh6rq005
Tags: 1.9.0-1
* Ready for sid, starting transition.
* All symfiles updated to latest builds.
* Added dh_numpy call in debian/rules to depend on numpy ABI.
* Policy bumped to 3.9.3, no changes required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ogr/ogrsf_frmts/dods/ogr_dods.h
1
1
/******************************************************************************
2
 
 * $Id: ogr_dods.h 15583 2008-10-23 00:04:33Z warmerdam $
 
2
 * $Id: ogr_dods.h 20634 2010-09-16 22:02:29Z rouault $
3
3
 *
4
4
 * Project:  OpenGIS Simple Features Reference Implementation
5
5
 * Purpose:  Private definitions for OGR/DODS driver.
61
61
#include <Sequence.h>
62
62
#include <Grid.h>
63
63
 
64
 
#define LIBDAP_310 /* This is supposed to be linked only against 3.10+ a better fix is included upstream */
65
64
#ifdef LIBDAP_310
 
65
/* AISConnect.h/AISConnect class was renamed to Connect.h/Connect in libdap 3.10 */
66
66
#include <Connect.h>
67
 
#define AISConnect Connect 
 
67
#define AISConnect Connect
68
68
#else
69
 
#include <AISConnect.h>         
 
69
#include <AISConnect.h>
70
70
#endif
71
71
 
72
72
#include <DDS.h>
169
169
    OGRDODSFieldDefn    oYField;
170
170
    OGRDODSFieldDefn    oZField;
171
171
 
172
 
    char               *pszSubSeqPath;
 
172
    const char         *pszSubSeqPath;
173
173
 
174
174
    Sequence           *poSuperSeq;
175
175