Commit 039d2c54 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Use datatypes from exse.h.

parent 127d6b69
......@@ -17,13 +17,12 @@
#include "datetime.h"
#include "extra.h"
#include "vlist.h"
#include "exse.h"
#undef UNDEFID
#define UNDEFID CDI_UNDEFID
#define SINGLE_PRECISION 4
#define DOUBLE_PRECISION 8
#if defined (HAVE_LIBEXTRA)
......@@ -39,9 +38,9 @@ int extInqDatatype(int prec, int number)
int datatype;
if ( number == 2 )
datatype = (prec == DOUBLE_PRECISION) ? DATATYPE_CPX64 : DATATYPE_CPX32;
datatype = (prec == EXSE_DOUBLE_PRECISION) ? DATATYPE_CPX64 : DATATYPE_CPX32;
else
datatype = (prec == DOUBLE_PRECISION) ? DATATYPE_FLT64 : DATATYPE_FLT32;
datatype = (prec == EXSE_DOUBLE_PRECISION) ? DATATYPE_FLT64 : DATATYPE_FLT32;
return datatype;
}
......@@ -56,7 +55,7 @@ void extDefDatatype(int datatype, int *prec, int *number)
*number = (datatype == DATATYPE_CPX32 || datatype == DATATYPE_CPX64) ? 2 : 1;
*prec = (datatype == DATATYPE_FLT64 || datatype == DATATYPE_CPX64) ? DOUBLE_PRECISION : SINGLE_PRECISION;
*prec = (datatype == DATATYPE_FLT64 || datatype == DATATYPE_CPX64) ? EXSE_DOUBLE_PRECISION : EXSE_SINGLE_PRECISION;
}
/* not used
......
......@@ -21,13 +21,12 @@
#include "ieg.h"
#include "stream_ieg.h"
#include "vlist.h"
#include "exse.h"
#undef UNDEFID
#define UNDEFID CDI_UNDEFID
#define SINGLE_PRECISION 4
#define DOUBLE_PRECISION 8
#if defined (HAVE_LIBIEG)
......@@ -41,7 +40,7 @@ typedef struct {
static
int iegInqDatatype(int prec)
{
return (prec == DOUBLE_PRECISION) ? DATATYPE_FLT64 : DATATYPE_FLT32;
return (prec == EXSE_DOUBLE_PRECISION) ? DATATYPE_FLT64 : DATATYPE_FLT32;
}
static
......@@ -53,7 +52,7 @@ int iegDefDatatype(int datatype)
if ( datatype != DATATYPE_FLT32 && datatype != DATATYPE_FLT64 )
datatype = DATATYPE_FLT32;
return (datatype == DATATYPE_FLT64) ? DOUBLE_PRECISION : SINGLE_PRECISION;
return (datatype == DATATYPE_FLT64) ? EXSE_DOUBLE_PRECISION : EXSE_SINGLE_PRECISION;
}
/* not used
......
......@@ -18,13 +18,12 @@
#include "service.h"
#include "stream_srv.h"
#include "vlist.h"
#include "exse.h"
#undef UNDEFID
#define UNDEFID CDI_UNDEFID
#define SINGLE_PRECISION 4
#define DOUBLE_PRECISION 8
#if defined (HAVE_LIBSERVICE)
......@@ -38,7 +37,7 @@ typedef struct {
static
int srvInqDatatype(int prec)
{
return (prec == DOUBLE_PRECISION) ? DATATYPE_FLT64 : DATATYPE_FLT32;
return (prec == EXSE_DOUBLE_PRECISION) ? DATATYPE_FLT64 : DATATYPE_FLT32;
}
......@@ -51,7 +50,7 @@ int srvDefDatatype(int datatype)
if ( datatype != DATATYPE_FLT32 && datatype != DATATYPE_FLT64 )
datatype = DATATYPE_FLT32;
return (datatype == DATATYPE_FLT64) ? DOUBLE_PRECISION : SINGLE_PRECISION;
return (datatype == DATATYPE_FLT64) ? EXSE_DOUBLE_PRECISION : EXSE_SINGLE_PRECISION;
}
/* not used
......
Markdown is supported
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