Commit 1b9007b1 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

cdfDefMapping: changed stream arguments to type stream_t

parent 79226f24
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for cdi 1.5.9.
# Generated by GNU Autoconf 2.68 for cdi 1.6.0.
#
# Report bugs to <http://code.zmaw.de/projects/cdi>.
#
......@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.5.9'
PACKAGE_STRING='cdi 1.5.9'
PACKAGE_VERSION='1.6.0'
PACKAGE_STRING='cdi 1.6.0'
PACKAGE_BUGREPORT='http://code.zmaw.de/projects/cdi'
PACKAGE_URL=''
 
......@@ -1403,7 +1403,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures cdi 1.5.9 to adapt to many kinds of systems.
\`configure' configures cdi 1.6.0 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1473,7 +1473,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.5.9:";;
short | recursive ) echo "Configuration of cdi 1.6.0:";;
esac
cat <<\_ACEOF
 
......@@ -1630,7 +1630,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.5.9
cdi configure 1.6.0
generated by GNU Autoconf 2.68
 
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2391,7 +2391,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by cdi $as_me 1.5.9, which was
It was created by cdi $as_me 1.6.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
$ $0 $@
......@@ -3323,7 +3323,7 @@ fi
 
# Define the identity of the package.
PACKAGE='cdi'
VERSION='1.5.9'
VERSION='1.6.0'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -27505,7 +27505,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by cdi $as_me 1.5.9, which was
This file was extended by cdi $as_me 1.6.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -27571,7 +27571,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
cdi config.status 1.5.9
cdi config.status 1.6.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
 
......
# Process this file with autoconf to produce a configure script.
AC_INIT([cdi], [1.5.9], [http://code.zmaw.de/projects/cdi])
AC_INIT([cdi], [1.6.0], [http://code.zmaw.de/projects/cdi])
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
......
......@@ -784,7 +784,7 @@ void cdfDefTimeValue(stream_t *streamptr, int tsID)
fileID = streamptr->fileID;
if ( CDI_Debug )
Message("streamID = %d, fileID = %d", streamID, fileID);
Message("streamptr = %p, fileID = %d", streamptr, fileID);
taxis = &streamptr->tsteps[tsID].taxis;
......@@ -2466,7 +2466,7 @@ void cdfDefZaxis(int streamID, int zaxisID)
#if defined (HAVE_LIBNETCDF)
static
void cdfDefPole(int streamID, int gridID)
void cdfDefPole(stream_t *streamptr, int gridID)
{
int fileID;
int ncvarid = UNDEFID;
......@@ -2499,7 +2499,7 @@ void cdfDefPole(int streamID, int gridID)
#if defined (HAVE_LIBNETCDF)
static
void cdfDefMapping(int streamID, int gridID)
void cdfDefMapping(stream_t *streamptr, int gridID)
{
int fileID;
int ncvarid = UNDEFID;
......@@ -2627,7 +2627,7 @@ void cdfDefGrid(int streamID, int gridID)
if ( gridInqYsize(gridID) > 0 ) cdfDefYaxis(streamID, gridID);
}
if ( gridIsRotated(gridID) ) cdfDefPole(streamID, gridID);
if ( gridIsRotated(gridID) ) cdfDefPole(streamptr, gridID);
}
else if ( gridtype == GRID_CURVILINEAR )
{
......@@ -2661,7 +2661,7 @@ void cdfDefGrid(int streamID, int gridID)
cdfDefXaxis(streamID, gridID);
cdfDefYaxis(streamID, gridID);
cdfDefMapping(streamID, gridID);
cdfDefMapping(streamptr, gridID);
}
/*
else if ( gridtype == GRID_LCC )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment