Patch level : 2.0 464

Files correlati     : gfm.dll
Ricompilazione Demo : [ ]
Commento            :
Modifiche per la compilazione Linux


git-svn-id: svn://10.65.10.50/trunk@11079 c028cbd2-c16b-5b4b-a496-9718f37d4682

gfm/compaux.c

@@ -107,6 +107,7 @@ DEC	*nperd,	*intr, *pv, *pmt, *fv;
 		return(GM_NULL);
 	}
 
+	intper = 0;
 	ad = begend;
 
 	if (opt!=GM_N)	{

gfm/demo12.c

@@ -15,7 +15,7 @@ void	SmartScan(s, pd)
 char	*s;
 DEC	*pd;
 {
-	bool	done;
+	short	done;
 	int	i;
 	
 	if (!pd)  {

gfm/demo13.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "gm.h"
 void ErrorHandler(int,int);
-void main(void);
+int main(void);
 
 void ErrorHandler(code,ref)
 int code,ref;
@@ -12,7 +12,7 @@ int code,ref;
 	printf("%s error in function %s\n",serr,sfun);
 }
 
-void	main()
+int main()
 {
 	DEC	da, *a=&da, db, *b=&db, dc, *c=&dc, *p;
 	
@@ -31,4 +31,5 @@ void	main()
 		dprintf("%t / %t = %t\n",a,b,c);
 	else
 		dprintf("Division failed.\n");
+	return 0;
 }

gfm/dfprintf.c

@@ -36,10 +36,7 @@
 #include "gm.h"
 #include "gmsystem.h"
 
-int FilePrintDecimal(stream,fmt, ELLIPSES)
-FILE *stream;
-char	*fmt;
-
+int FilePrintDecimal(FILE *stream, char	*fmt, ELLIPSES)
 {
 	char	**outval, buffer[256];
 	int	i;

gfm/dfscanf.c

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

gfm/dftod.c

@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include "gm.h"
 #include "gmsystem.h"
+#include "math.h"
 
 DEC	*ConvDoubleToDecimal( x, f)
 DEC	*x;

gfm/dmbyp10tc.c

@@ -30,11 +30,9 @@
 extern double pow(double, double);
 
 
-void    _DivUnsArrByPwrOf10Trunc(a,n,p)
-unsigned  SHORT       a[];
-int             n,p;
+void    _DivUnsArrByPwrOf10Trunc(unsigned  SHORT a[],int n,int p)
 {
-int ppdf,i;
+int ppdf;
 
   while (p>4)
     {

gfm/dprintf.c

@@ -30,13 +30,11 @@
  *
  */
 
-#include <stdio.h>
 #include "gm.h"
 #include "gmsystem.h"
+#include <stdio.h>
 
-int PrintDecimal(fmt, ELLIPSES)
-char	*fmt;
-
+int PrintDecimal(char * fmt, ELLIPSES)
 {
 	char	**outval, buffer[256];
 	int	i;

gfm/dscanf.c

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

gfm/dsprintf.c

@@ -37,10 +37,7 @@
 
 static int _StackSize(char, char);
 
-int StringPrintDecimal(buffer,fmt, ELLIPSES)
-char *buffer;
-char *fmt;
-
+int StringPrintDecimal(char * buffer, char * fmt, ELLIPSES)
 {
 	char	newfmt[256], lastcode, thiscode;
 	int	*inval,	outval[21];
@@ -283,6 +280,7 @@ char cPrec;
 #ifndef	LATTICE
 #ifndef	M_I386
 #ifndef WIN32
+#ifndef __GNUC__
 			if (cPrec=='F')
 				w = sizeof(char	far *);
 			else if	(cPrec=='N')
@@ -290,6 +288,7 @@ char cPrec;
 			else
 #endif
 #endif
+#endif
 #endif
 				w = sizeof(char	*);
 			break;

gfm/dsscanf.c

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

gfm/dzero.c

@@ -28,8 +28,7 @@
 #include "gm.h"
 #include "gmsystem.h"
 
-DEC	*ZeroDecimal(x)
-DEC	*x;
+DEC	*ZeroDecimal(DEC * x)
 {
 
 	_MacStart(GM_DZERO);

gfm/gf.h

@@ -27,15 +27,11 @@
 #define GF_CDECL /*cdecl eliminato */
 
 #define EOS     '\0'
-#ifdef M_I386
 typedef unsigned short  word;
-#else
-typedef unsigned int    word;
-#endif
 #ifndef GLOS2
 typedef char            BYTE;
 #endif
-typedef int             mbool; 
+typedef int             mbool;
 #define VIDEO   0x10
 #define DOSINT  0x21
 struct GFREGS   { int ax,bx,cx,dx,si,di,ds,es; };

gfm/gfd.h

@@ -1,6 +1,13 @@
 #ifndef __GFD_H
 #define __GFD_H
 
+#ifdef WIN32
+#define uint64 unsigned __int64
+#else
+#include <sys/types.h>
+#define uint64	u_int64_t
+#endif
+
 typedef struct idec {
         SHORT           attr;
         SHORT           id;
@@ -18,7 +25,7 @@ typedef struct ldec {
 typedef struct hdec {
         short             lattr;                  /* redef's for long's */
         short             lid;
-        unsigned __int64  hsl;
+        uint64            hsl;
         short             lmsd;
         } HDEC;
 

gfm/gmsystem.h

@@ -5,9 +5,7 @@
 *       Contains definitions and prototypes used by internal routines.
 *       Copyright (C)1987-1990 Greenleaf Software Inc.  All rights reserved.
 */
-#ifndef _MSC
-#define _MSC
-#endif
+
 #ifndef GMDOTH
 #include <gm.h>
 #endif

gfm/scanfx.c

@@ -46,11 +46,7 @@
 #include "import.h"
 #endif
 
-int _ScanfAux(wOpt,	sBuffer, sFmt, ELLIPSES)
-int wOpt;
-char *sBuffer;
-char *sFmt;
-
+int _ScanfAux(int wOpt,char *	sBuffer, char * sFmt, ELLIPSES)
 {
 	char	sNewFmt[256], cType, *pStrArr[21], *pTemp;
 	int	*pInVal, pOutVal[21];