From 024bd0832fdfa12e84040b1f03f9a8fac3a52628 Mon Sep 17 00:00:00 2001
From: dborca <>
Date: Mon, 4 Oct 2004 09:04:24 +0000
Subject: [PATCH] avoid silly warnings

---
 glide3x/sst1/init/initvg/dac.c    | 2 +-
 glide3x/sst1/init/initvg/gdebug.c | 3 ++-
 glide3x/sst1/init/initvg/parse.c  | 9 +++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/glide3x/sst1/init/initvg/dac.c b/glide3x/sst1/init/initvg/dac.c
index 5b63744..1301abe 100644
--- a/glide3x/sst1/init/initvg/dac.c
+++ b/glide3x/sst1/init/initvg/dac.c
@@ -925,7 +925,7 @@ FxBool sst1InitSetGrxClkINI(FxU32 *sstbase, sst1ClkTimingStruct
     setMemClk = iniDac->setMemClk;
     while(setMemClk) {
 #ifdef DIRECTX
-        if(setMemClk->frequency == FTOL(sstGrxClk->freq) ) {
+        if(setMemClk->frequency == (FxU32) FTOL(sstGrxClk->freq) ) {
 #else
         if(setMemClk->frequency == (FxU32) sstGrxClk->freq) {
 #endif
diff --git a/glide3x/sst1/init/initvg/gdebug.c b/glide3x/sst1/init/initvg/gdebug.c
index b1903f0..f23d517 100644
--- a/glide3x/sst1/init/initvg/gdebug.c
+++ b/glide3x/sst1/init/initvg/gdebug.c
@@ -260,5 +260,6 @@ gdbg_set_file(const char *name)
         outf = fopen(name,"w");             // open up a new one
         if (outf) gdbg_msgfile = outf;
         return outf != NULL;
-    } 
+    }
+    return FXTRUE;
 }
diff --git a/glide3x/sst1/init/initvg/parse.c b/glide3x/sst1/init/initvg/parse.c
index 5f8a5db..e1087a5 100644
--- a/glide3x/sst1/init/initvg/parse.c
+++ b/glide3x/sst1/init/initvg/parse.c
@@ -36,6 +36,11 @@
 #include <sst1vid.h>
 #include <sst1init.h>
 
+#if __WIN32__
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif /* __WIN32__ */
+
 static int sst1InitFgets(char *, FILE *);
 static int sst1InitFgetc(FILE *);
 static int sst1InitParseFieldDac(char *);
@@ -221,10 +226,6 @@ __errExit:
 
 #if defined(INIT_DOS) || defined(INIT_LINUX)
 
-#if __WIN32__
-#include <windows.h>
-#endif /* __WIN32__ */
-
 /* Get the definition of myGetenv for glide builds */
 #include <init.h>