Patch level :2.0 aga 370

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :sistemate le librerie gfm (allineate a partners version)


git-svn-id: svn://10.65.10.50/trunk@10750 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2003-01-17 12:20:25 +00:00
parent 95ee99e63c
commit ac8ecb0b9f
21 changed files with 44 additions and 53 deletions

View File

@ -31,10 +31,6 @@
#include "gm.h"
#include "gmsystem.h"
#ifndef DOS
extern char *calloc(unsigned ,unsigned );
#endif
DEC *AllocateDecimal()
{
DEC *a;

View File

@ -38,10 +38,6 @@
#include "gm.h"
#include "gmsystem.h"
#ifndef DOS
extern char *calloc(unsigned ,unsigned );
#endif
DEC **AllocateDecimalArray(dst, n)
int n;
DEC **dst;

View File

@ -36,7 +36,7 @@
#include "gm.h"
#include "gmsystem.h"
int FilePrintDecimal(stream,fmt)
int FilePrintDecimal(stream,fmt, ELLIPSES)
FILE *stream;
char *fmt;

View File

@ -39,7 +39,7 @@
#include "gm.h"
#include "gmsystem.h"
int FileScanDecimal(fFile,sFmt)
int FileScanDecimal(fFile,sFmt, ELLIPSES)
FILE *fFile;
char *sFmt;

View File

@ -1,5 +1,11 @@
#include <windows.h>
#ifdef WIN32
BOOL APIENTRY DllMain( HANDLE hModule, DWORD reasonForCall, LPVOID reserved )
{
return 1 ;
}
#else
int FAR PASCAL WEP(int p)
{
int ok = 0;
@ -11,3 +17,4 @@ int FAR PASCAL WEP(int p)
}
return ok;
}
#endif

View File

@ -34,7 +34,7 @@ void _DivUnsArrByPwrOf10(a,n,p)
unsigned SHORT a[];
int n,p;
{
int ppdf,i;
int ppdf;
while (p>4)
{
_DivUnsArrByUns(a,10000,n);

View File

@ -34,7 +34,7 @@ void _DivUnsArrByPwrOf10Trunc(a,n,p)
unsigned SHORT a[];
int n,p;
{
int ppdf,i;
int ppdf;
while (p>4)
{

View File

@ -34,7 +34,7 @@
#include "gm.h"
#include "gmsystem.h"
int PrintDecimal(fmt)
int PrintDecimal(fmt, ELLIPSES)
char *fmt;
{

View File

@ -38,7 +38,7 @@
#include "gm.h"
#include "gmsystem.h"
int ScanDecimal(sFmt)
int ScanDecimal(sFmt, ELLIPSES)
char *sFmt;
{

View File

@ -36,10 +36,6 @@
#include <malloc.h>
#include "gmsystem.h"
#ifndef DOS
extern char *calloc(unsigned ,unsigned );
#endif
DEC **SortDecimalArray(dst, src, n, opt)
DEC **dst, **src;
int n, opt;

View File

@ -37,7 +37,7 @@
static int _StackSize(char, char);
int StringPrintDecimal(buffer,fmt)
int StringPrintDecimal(buffer,fmt, ELLIPSES)
char *buffer;
char *fmt;
@ -282,12 +282,14 @@ char cPrec;
case 's': case 'p': {
#ifndef LATTICE
#ifndef M_I386
#ifndef WIN32
if (cPrec=='F')
w = sizeof(char far *);
else if (cPrec=='N')
w = sizeof(char near *);
else
#endif
#endif
#endif
w = sizeof(char *);
break;

View File

@ -38,7 +38,7 @@
#include "gm.h"
#include "gmsystem.h"
int StringScanDecimal(sBuffer, sFmt)
int StringScanDecimal(sBuffer, sFmt, ELLIPSES)
char *sBuffer;
char *sFmt;

View File

@ -4,6 +4,10 @@
#ifndef _MSC
#define _MSC 5
#endif
#if defined (WIN32) && !defined(M_I386)
#define M_I386
#endif
/* Required GF.H Header for Microsoft C
*
* Copyright (C) 1983-89 Greenleaf Software, Inc. All rights reserved.

View File

@ -15,9 +15,17 @@ typedef struct ldec {
short lmsd;
} LDEC;
typedef struct hdec {
short lattr; /* redef's for long's */
short lid;
unsigned __int64 hsl;
short lmsd;
} HDEC;
typedef union {
IDEC dc;
LDEC ls;
HDEC hs;
} DEC;
typedef DEC DECP[1];

View File

@ -1,4 +1,5 @@
#include <stdio.h>
#include <string.h>
#include "gm.h"
main()

View File

@ -13,14 +13,9 @@
#endif
#define ELLIPSES ...
#ifdef __cplusplus
extern "C" {
//#else
//#if defined(__GNUC__) || defined(__WATCOMC__) || defined(__TURBOC__) || defined(__MSVC__)
//#define ELLIPSES ...
//#else
//#define ELLIPSES
//#endif
#endif
GFM_EXPORT DEC *AbsoluteDecimal( DEC *, DEC * );
@ -42,16 +37,16 @@ GFM_EXPORT DEC *AllocateDecimal( void );
GFM_EXPORT DEC* *AllocateDecimalArray( DEC *[], int );
GFM_EXPORT void Amortize( DEC *, DEC *, DEC *, DEC *, DEC *, DEC *, int , int );
GFM_EXPORT void AmortizeTable( DEC *[], DEC *[], DEC *[], DEC *, DEC *, DEC *,
int , int );
int , int );
GFM_EXPORT DEC *AntiLog10Decimal( DEC *, DEC * );
GFM_EXPORT DEC *AntiLogEDecimal( DEC *, DEC * );
GFM_EXPORT DEC *ArcCosineDecimal( DEC *, DEC *);
GFM_EXPORT DEC *ArcSineDecimal( DEC *, DEC *);
GFM_EXPORT DEC *ArcTangentDecimal( DEC *, DEC *);
GFM_EXPORT DEC *BondPrice( DEC *, DEC *, DEC *, DEC *, int , int , int , int ,
int , int , int );
int , int , int );
GFM_EXPORT DEC *BondYield( DEC *, DEC *, DEC *, int , int , int , int , int ,
int , int );
int , int );
GFM_EXPORT DEC *ChangeSignDecimal( DEC *, DEC * );
GFM_EXPORT void ClearMathError( void );
GFM_EXPORT int CompareDecimal( DEC *, DEC * );
@ -107,21 +102,21 @@ GFM_EXPORT DEC *DecimalPercentage( DEC *, DEC *, int );
GFM_EXPORT int DecimalPrecision( DEC * );
GFM_EXPORT DEC *DeleteTrailingZeroes( DEC *, DEC * );
GFM_EXPORT DEC *DepreciateDeclining( DEC *, DEC *, DEC *, DEC *, DEC *, int ,
DEC *, int );
DEC *, int );
GFM_EXPORT DEC* *DepreciateDecliningTable( DEC *[], DEC *[], DEC *, DEC *, DEC *,
int , DEC *);
int , DEC *);
GFM_EXPORT DEC *DepreciateDoubleDeclining( DEC *, DEC *, DEC *, DEC *, int ,
DEC *, int );
DEC *, int );
GFM_EXPORT DEC* *DepreciateDoubleDecliningTable( DEC *[], DEC *[], DEC *, DEC *,
int , DEC *);
int , DEC *);
GFM_EXPORT DEC *DepreciateStraightLine( DEC *, DEC *, DEC *, DEC *, int , DEC *,
int );
int );
GFM_EXPORT DEC* *DepreciateStraightLineTable( DEC *[], DEC *[], DEC *, DEC *, int ,
DEC *);
DEC *);
GFM_EXPORT DEC *DepreciateSumOfYears( DEC *, DEC *, DEC *, DEC *, int , DEC *,
int );
int );
GFM_EXPORT DEC* *DepreciateSumOfYearsTable( DEC *[], DEC *[], DEC *, DEC *, int ,
DEC *);
DEC *);
GFM_EXPORT DEC *DivideAscii( DEC *, char *, char *);
GFM_EXPORT DEC *DivideDecimal( DEC *, DEC *, DEC *);
GFM_EXPORT DEC *DivideDecimalAndRound( DEC *, DEC *, DEC *, int );

View File

@ -1,4 +1,2 @@
#define BITSPERUI 16
#define SHORT short

View File

@ -59,11 +59,7 @@ extern DEC decPoint01;
extern "C" {
#endif
#ifdef M_I386
#define SHORT short
#else
#define SHORT int
#endif
int _AddDec80Bit( DEC *, DEC *, DEC *);
int GF_CDECL _AddUnsArrToUnsArr( unsigned SHORT [], unsigned SHORT [],

View File

@ -35,10 +35,6 @@
#include "gm.h"
#include "gmsystem.h"
#ifndef DOS
extern char *calloc(unsigned ,unsigned );
#endif
DEC *Median(pDst,pSrc,n)
DEC *pDst;
DEC **pSrc;

View File

@ -73,7 +73,7 @@ unsigned SHORT pa[];
int n,w;
{
int ppdf,k,i;
int ppdf,k;
k=GM_SUCCESS;

View File

@ -46,11 +46,7 @@
#include "import.h"
#endif
#ifndef DOS
extern char *calloc(unsigned ,unsigned );
#endif
int _ScanfAux(wOpt, sBuffer, sFmt)
int _ScanfAux(wOpt, sBuffer, sFmt, ELLIPSES)
int wOpt;
char *sBuffer;
char *sFmt;