From ac8ecb0b9fbd6a4cdc4d43e2107ebf75a825fcca Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 17 Jan 2003 12:20:25 +0000
Subject: [PATCH] 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
---
 gfm/dalloc.c   |  4 ----
 gfm/daralloc.c |  4 ----
 gfm/dfprintf.c |  2 +-
 gfm/dfscanf.c  |  2 +-
 gfm/dllgfm.c   |  7 +++++++
 gfm/dmbyp10.c  |  2 +-
 gfm/dmbyp10t.c |  2 +-
 gfm/dprintf.c  |  2 +-
 gfm/dscanf.c   |  2 +-
 gfm/dsort.c    |  4 ----
 gfm/dsprintf.c |  4 +++-
 gfm/dsscanf.c  |  2 +-
 gfm/gf.h       |  4 ++++
 gfm/gfd.h      |  8 ++++++++
 gfm/gl.c       |  1 +
 gfm/gmfuncts.h | 29 ++++++++++++-----------------
 gfm/gmsys1.h   |  2 --
 gfm/gmsystem.h |  4 ----
 gfm/median.c   |  4 ----
 gfm/mul10.c    |  2 +-
 gfm/scanfx.c   |  6 +-----
 21 files changed, 44 insertions(+), 53 deletions(-)

diff --git a/gfm/dalloc.c b/gfm/dalloc.c
index b8bf3352b..da9328ea3 100755
--- a/gfm/dalloc.c
+++ b/gfm/dalloc.c
@@ -31,10 +31,6 @@
 #include "gm.h"
 #include "gmsystem.h"
 
-#ifndef DOS
-extern	char	*calloc(unsigned ,unsigned );
-#endif
-
 DEC	*AllocateDecimal()
 {
 	DEC	*a;
diff --git a/gfm/daralloc.c b/gfm/daralloc.c
index e788a9aa4..90e8b0617 100755
--- a/gfm/daralloc.c
+++ b/gfm/daralloc.c
@@ -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;
diff --git a/gfm/dfprintf.c b/gfm/dfprintf.c
index e704024c7..350534ae3 100755
--- a/gfm/dfprintf.c
+++ b/gfm/dfprintf.c
@@ -36,7 +36,7 @@
 #include "gm.h"
 #include "gmsystem.h"
 
-int FilePrintDecimal(stream,fmt)
+int FilePrintDecimal(stream,fmt, ELLIPSES)
 FILE *stream;
 char	*fmt;
 
diff --git a/gfm/dfscanf.c b/gfm/dfscanf.c
index 740d10722..305b12cd6 100755
--- a/gfm/dfscanf.c
+++ b/gfm/dfscanf.c
@@ -39,7 +39,7 @@
 #include "gm.h"
 #include "gmsystem.h"
 
-int FileScanDecimal(fFile,sFmt)
+int FileScanDecimal(fFile,sFmt, ELLIPSES)
 FILE *fFile;
 char *sFmt;
 
diff --git a/gfm/dllgfm.c b/gfm/dllgfm.c
index c92b2be1a..4ca1f19ef 100755
--- a/gfm/dllgfm.c
+++ b/gfm/dllgfm.c
@@ -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
\ No newline at end of file
diff --git a/gfm/dmbyp10.c b/gfm/dmbyp10.c
index e0af4e9e2..eaf399e3a 100755
--- a/gfm/dmbyp10.c
+++ b/gfm/dmbyp10.c
@@ -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);
diff --git a/gfm/dmbyp10t.c b/gfm/dmbyp10t.c
index 03dd46ff4..4e8980280 100755
--- a/gfm/dmbyp10t.c
+++ b/gfm/dmbyp10t.c
@@ -34,7 +34,7 @@ void    _DivUnsArrByPwrOf10Trunc(a,n,p)
 unsigned  SHORT       a[];
 int             n,p;
 {
-int ppdf,i;
+int ppdf;
 
   while (p>4)
     {
diff --git a/gfm/dprintf.c b/gfm/dprintf.c
index 607cd6ae0..364b8aedd 100755
--- a/gfm/dprintf.c
+++ b/gfm/dprintf.c
@@ -34,7 +34,7 @@
 #include "gm.h"
 #include "gmsystem.h"
 
-int PrintDecimal(fmt)
+int PrintDecimal(fmt, ELLIPSES)
 char	*fmt;
 
 {
diff --git a/gfm/dscanf.c b/gfm/dscanf.c
index 798226b75..84879561a 100755
--- a/gfm/dscanf.c
+++ b/gfm/dscanf.c
@@ -38,7 +38,7 @@
 #include "gm.h"
 #include "gmsystem.h"
 
-int ScanDecimal(sFmt)
+int ScanDecimal(sFmt, ELLIPSES)
 char *sFmt;
 
 {
diff --git a/gfm/dsort.c b/gfm/dsort.c
index 0897a683d..302239ee2 100755
--- a/gfm/dsort.c
+++ b/gfm/dsort.c
@@ -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;
diff --git a/gfm/dsprintf.c b/gfm/dsprintf.c
index 9499ce909..a0e7e2bb7 100755
--- a/gfm/dsprintf.c
+++ b/gfm/dsprintf.c
@@ -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;
diff --git a/gfm/dsscanf.c b/gfm/dsscanf.c
index 89ba9bfd9..b4101b6db 100755
--- a/gfm/dsscanf.c
+++ b/gfm/dsscanf.c
@@ -38,7 +38,7 @@
 #include "gm.h"
 #include "gmsystem.h"
 
-int StringScanDecimal(sBuffer, sFmt)
+int StringScanDecimal(sBuffer, sFmt, ELLIPSES)
 char *sBuffer;
 char *sFmt;
 
diff --git a/gfm/gf.h b/gfm/gf.h
index c1bf6a942..c178a14ca 100755
--- a/gfm/gf.h
+++ b/gfm/gf.h
@@ -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.
diff --git a/gfm/gfd.h b/gfm/gfd.h
index 5a151a8ea..3d664e35e 100755
--- a/gfm/gfd.h
+++ b/gfm/gfd.h
@@ -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];
diff --git a/gfm/gl.c b/gfm/gl.c
index 34c59fea7..f8c3cc03f 100755
--- a/gfm/gl.c
+++ b/gfm/gl.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <string.h>
 #include "gm.h"
 
 main()
diff --git a/gfm/gmfuncts.h b/gfm/gmfuncts.h
index 2c3f9710a..1ed1fa611 100755
--- a/gfm/gmfuncts.h
+++ b/gfm/gmfuncts.h
@@ -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  );
diff --git a/gfm/gmsys1.h b/gfm/gmsys1.h
index 6dab9f3c2..5d98642eb 100755
--- a/gfm/gmsys1.h
+++ b/gfm/gmsys1.h
@@ -1,4 +1,2 @@
 #define BITSPERUI 16
 #define SHORT short
-
-
diff --git a/gfm/gmsystem.h b/gfm/gmsystem.h
index c50f80b02..24cb452fc 100755
--- a/gfm/gmsystem.h
+++ b/gfm/gmsystem.h
@@ -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 [],
diff --git a/gfm/median.c b/gfm/median.c
index 7aebe0d0f..6cf7d88ed 100755
--- a/gfm/median.c
+++ b/gfm/median.c
@@ -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;
diff --git a/gfm/mul10.c b/gfm/mul10.c
index e4bdfda77..d4436ce93 100755
--- a/gfm/mul10.c
+++ b/gfm/mul10.c
@@ -73,7 +73,7 @@ unsigned SHORT        pa[];
 int             n,w;
 {
 
-int ppdf,k,i;
+int ppdf,k;
 
   k=GM_SUCCESS;
 
diff --git a/gfm/scanfx.c b/gfm/scanfx.c
index 87246f386..8329972f9 100755
--- a/gfm/scanfx.c
+++ b/gfm/scanfx.c
@@ -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;