Subject:
Warning fixups
From:
S A McConnell ####@####.####
Date:
22 Aug 2000 14:57:42 -0000
Message-Id: <39A29600.427D4E33@cotw.com>
Here are some patches tha eliminate warnings.
Scott
--- old-microwin/src/demos/mwin/demo.c Mon Aug 21 23:30:50 2000
+++ microwin/src/demos/mwin/demo.c Tue Aug 22 09:47:48 2000
@@ -6,6 +6,7 @@
#define MWINCLUDECOLORS
#include "windows.h"
#include "wintern.h" /* for MwSetDesktopWallpaper*/
+#include "device.h"
#if DOS_TURBOC
unsigned _stklen = 4096;
@@ -194,10 +195,10 @@
#if GRAPH3D
int id;
static vec1 gx, gy;
+ static int countup = 1;
#endif
#if TIMERDEMO
static POINT mousept;
- static int countup = 1;
#endif
#if ARCDEMO
static int startdegrees = 0;
--- old-microwin/src/engine/devimage.c Mon Aug 21 23:30:50 2000
+++ microwin/src/engine/devimage.c Tue Aug 22 08:26:01 2000
@@ -27,8 +27,12 @@
static int nextimageid = 1;
static void ComputePitch(int bpp, int width, int *pitch, int *bytesperpixel);
+
+#if defined(HAVE_JPEG_SUPPORT)
static int LoadJPEG(FILE *fp, PMWIMAGEHDR pimage, PSD psd,
MWBOOL fast_grayscale);
+#endif
+
static int LoadBMP(FILE *fp, PMWIMAGEHDR pimage);
static int LoadGIF(FILE *fp, PMWIMAGEHDR pimage);
--- old-microwin/src/demos/nanox/t1demo.c Mon Aug 21 23:30:50 2000
+++ microwin/src/demos/nanox/t1demo.c Tue Aug 22 09:41:23 2000
@@ -56,10 +56,10 @@
GR_FONT_ID fontid;
GR_REGION_ID regionid = 0;
GR_RECT clip_rect={100,100,300,300};
- GR_POINT points[]={ {100, 100},
- {300, 100},
- {300, 300},
- {100, 300}};
+ //GR_POINT points[]={ {100, 100},
+ // {300, 100},
+ // {300, 300},
+ // {100, 300}};
int i, x, y;
srand(time(0));
--- old-microwin/src/demos/wterm/wterm.c Mon Aug 21 23:30:51 2000
+++ microwin/src/demos/wterm/wterm.c Tue Aug 22 08:41:31 2000
@@ -86,8 +86,11 @@
static short winw, winh, pid, console;
static int pipeh;
static short cblink = 0, visualbell = 0, debug = 0;
+
+#ifdef __FreeBSD__
static char pty[SMALLBUFFER];
static struct winsize winsz;
+#endif
#define fonh fi.height
#define fonw fi.maxwidth
@@ -775,6 +778,8 @@
exit(1);
}
+int term_init();
+
/*
* guess what... :)
*/
@@ -787,7 +792,12 @@
short xp, yp, fsize;
char *family, *shell = NULL, *cptr, *geometry = NULL;
struct passwd *pw;
- char buf[80], *ptr;
+ char buf[80];
+
+#ifdef __FreeBSD__
+ char *ptr;
+#endif
+
short uid;
char thesh[128];