Commit b0362876 authored by ml's avatar ml

*** empty log message ***

parent 0a69afec
......@@ -424,7 +424,7 @@ dbs_Map(pwr_tStatus *sts, dbs_sEnv *ep, const char *filename)
struct stat sb;
int ret;
int fd;
#define DBS_DEBUG 1
#define DBS_DEBUG 0
#if DBS_DEBUG
int i;
dbs_sFile *fp;
......
......@@ -250,34 +250,10 @@ pdr_co_mFormat(PDR *pdrs, co_mFormat *objp)
/*
* pdr_IsPdrNeeded
*/
pwr_tBoolean pdr_IsPdrNeeded(co_sPlatform *plat1, co_sPlatform *plat2)
{
if (plat1->fm.m == plat2->fm.m)
return FALSE;
else
return TRUE;
}
/*
* PDR Routines
*/
pwr_tBoolean
pdr_co_sPlatform(PDR *pdrs, co_sPlatform *objp)
{
PWR_PDR_INT(pdrs, &objp->os);
PWR_PDR_INT(pdrs, &objp->hw);
PWR_PDR_INT(pdrs, &objp->fm.m);
return TRUE;
}
pwr_tBoolean
pdr_cdh_sObjName(PDR *pdrs, cdh_sObjName *objp)
{
......
......@@ -94,10 +94,6 @@ pwr_tBoolean pdr_float(PDR *pdrs, float *fp);
pwr_tBoolean pdr_vector(PDR *pdrs, char *arrp, u_int size, u_int elsize, pdrproc_t elproc);
pwr_tBoolean pdr_IsPdrNeeded(co_sPlatform *plat1, co_sPlatform *plat2);
#define pdr_pwr_tChar pdr_char
#define pdr_pwr_tFloat32 pdr_float
......@@ -117,9 +113,6 @@ pdr_cdh_sObjName(PDR *pdrs, cdh_sObjName *objp);
pwr_tBoolean
pdr_co_mFormat(PDR *pdrs, co_mFormat *objp);
pwr_tBoolean
pdr_co_sPlatform(PDR *pdrs, co_sPlatform *objp);
#define pdr_pwr_eType(pdrs, objp) pdr_enum(pdrs, (pdr_tEnum *)objp)
pwr_tBoolean
......
......@@ -34,7 +34,8 @@ co_sPlatform* co_GetOwnPlatform(co_sPlatform *platform)
{
platform->os = co_dHostOS;
platform->hw = co_dHostHW;
co_GetOwnFormat(&platform->fm);
platform->bo = co_dHostByteOrder;
platform->ft = co_dHostFloatType;
return platform;
}
......
......@@ -193,12 +193,12 @@ typedef union {
typedef struct {
co_eOS os;
co_eHW hw;
co_mFormat fm;
co_eOS os;
co_eHW hw;
co_eBO bo;
co_eFT ft;
} co_sPlatform;
co_mFormat* co_GetOwnFormat(co_mFormat *format);
co_sPlatform* co_GetOwnPlatform(co_sPlatform *platform);
co_mFormat* co_SetFormat(co_mFormat *format, co_eBO bo, co_eFT ft);
......
......@@ -69,7 +69,7 @@
*/
pwr_tBoolean co_IsXdrNeeded(co_sPlatform *plat1, co_sPlatform *plat2)
{
if (plat1->fm.m == plat2->fm.m)
if (plat1->bo == plat2->bo && plat1->ft == plat2->ft)
return FALSE;
return TRUE;
......@@ -85,7 +85,8 @@ xdr_co_sPlatform(XDR *xdrs, co_sPlatform *objp)
{
if (!xdr_int(xdrs, (int *)&objp->os)) return FALSE;
if (!xdr_int(xdrs, (int *)&objp->hw)) return FALSE;
if (!xdr_int(xdrs, (int *)&objp->fm.m)) return FALSE;
if (!xdr_int(xdrs, (int *)&objp->bo)) return FALSE;
if (!xdr_int(xdrs, (int *)&objp->ft)) return FALSE;
return TRUE;
}
......
......@@ -1313,8 +1313,8 @@ qdb_Platform (
co_GetOwnPlatform(&platform);
np->os = platform.os;
np->hw = platform.hw;
np->bo = platform.fm.b.bo;
np->ft = platform.fm.b.ft;
np->bo = platform.bo;
np->ft = platform.ft;
}
......
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