Added win32 port contributed by Blake McBride

<blake@florida-software.com>.

* README.WIN32, win32-diffs: New files.
* NEWS: Updated.

* src/preproc/grn/hgraph.cc (HGSetBrush): Replace `%lf' with `%f'.
(tmove, tmove2): Added parentheses to avoid compiler warnings.
(change): Removed unused variables.

* src/preproc/grn/main.cc (main, conv): Removed unused variables.
(savebounds): Changed return value from `int' to `void'.
* src/preproc/grn/hdb.cc: Ditto.

* src/devices/grolbp/lbp.cc (lbp_printer::draw): Removed superfluous
final backslash in comment to avoid compiler warning.

* src/utils/pfbtops/pfbtops.c: Added `getopt.h'.

* doc/groff.texinfo: More fixes.


* tmac/tmac.doc: Documentation fix.

7 files changed, 17 insertions, 14 deletions

diff --git a/src/devices/grohtml/ChangeLog b/src/devices/grohtml/ChangeLog
index afbf8727..c631190d 100755
--- a/src/devices/grohtml/ChangeLog
+++ b/src/devices/grohtml/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-11  Werner LEMBERG  <wl@gnu.org>
+
+	* output.cc (simple_output::simple_output): Reordering of
+	initializers to remove compiler warning.
+
 2000-04-28  Gaius Mulley  <gaius@glam.ac.uk>
 
 	* html.cc (calculate_margin): Calculate the left and right margin
diff --git a/src/devices/grohtml/output.cc b/src/devices/grohtml/output.cc
index 48c85ee0..d6dc1884 100644
--- a/src/devices/grohtml/output.cc
+++ b/src/devices/grohtml/output.cc
@@ -51,7 +51,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
  */
 
 simple_output::simple_output(FILE *f, int n)
-: fp(f), col(0), max_line_length(n), need_space(0), fixed_point(0)
+: fp(f), max_line_length(n), col(0), need_space(0), fixed_point(0)
 {
 }
 
diff --git a/src/devices/grolbp/lbp.cc b/src/devices/grolbp/lbp.cc
index d759dfc8..e434bb48 100644
--- a/src/devices/grolbp/lbp.cc
+++ b/src/devices/grolbp/lbp.cc
@@ -420,8 +420,8 @@ void lbp_printer::draw(int code, int *p, int np, const environment *env)
 			   * vdmstart() */
 			};
 			if (vdminited()) vdmlinewidth(line_thickness);
-			// fprintf(stderr,"\nthickness: %d == %d, size %d\n",\
-			// p[0],line_thickness,env->size );
+			// fprintf(stderr,"\nthickness: %d == %d, size %d\n",
+			//         p[0],line_thickness,env->size );
 			break;
 		} // else
 
diff --git a/src/preproc/grn/hdb.cc b/src/preproc/grn/hdb.cc
index e5d8a4ed..bf72ea1f 100644
--- a/src/preproc/grn/hdb.cc
+++ b/src/preproc/grn/hdb.cc
@@ -21,7 +21,7 @@
 extern int linenum;		/* current line number in input file */
 extern char gremlinfile[];	/* name of file currently reading */
 extern int SUNFILE;		/* TRUE if SUN gremlin file */
-extern int savebounds(float x, float y);
+extern void savebounds(float x, float y);
 
 /* imports from hpoint.cc */
 
diff --git a/src/preproc/grn/hgraph.cc b/src/preproc/grn/hgraph.cc
index dc408b81..ec0a7dcb 100644
--- a/src/preproc/grn/hgraph.cc
+++ b/src/preproc/grn/hgraph.cc
@@ -395,7 +395,7 @@ HGSetBrush(int mode)
   }
   if (linethickness != thick[mode]) {
     linethickness = thick[mode];
-    printf("\\h'-%.2lfp'\\D't %.2lfp'", linethickness, linethickness);
+    printf("\\h'-%.2fp'\\D't %.2fp'", linethickness, linethickness);
     printed = 1;
   }
   if (printed)
@@ -458,11 +458,11 @@ tmove2(int px,
   register int dx;
   register int dy;
 
-  if (dy = py - lasty) {
+  if ((dy = py - lasty)) {
     printf("\\v'%du'", dy);
   }
   lastyline = lasty = py;	/* lasty is always set to current */
-  if (dx = px - lastx) {
+  if ((dx = px - lastx)) {
     printf("\\h'%du'", dx);
     lastx = px;
   }
@@ -486,11 +486,11 @@ tmove(POINT * ptr)
   register int dx;
   register int dy;
 
-  if (dy = iy - lasty) {
+  if ((dy = iy - lasty)) {
     printf(".sp %du\n", dy);
   }
   lastyline = lasty = iy;	/* lasty is always set to current */
-  if (dx = ix - lastx) {
+  if ((dx = ix - lastx)) {
     printf("\\h'%du'", dx);
     lastx = ix;
   }
@@ -936,8 +936,6 @@ change(register int x,
        register int y,
        register int vis)
 {
-  static int xorg;
-  static int yorg;
   static int length = 0;
 
   if (vis) {			/* leaving a visible area, draw it. */
diff --git a/src/preproc/grn/main.cc b/src/preproc/grn/main.cc
index 244aece7..bcbb2df8 100644
--- a/src/preproc/grn/main.cc
+++ b/src/preproc/grn/main.cc
@@ -249,7 +249,6 @@ main(int argc,
   register int gfil = 0;
   char *file[50];
   char *operand(int *argcp, char ***argvp);
-  char *p;
 
   while (--argc) {
     if (**++argv != '-')
@@ -472,7 +471,7 @@ conv(register FILE *fp,
   register ELT *e;		/* current element pointer */
   ELT *PICTURE;			/* whole picture data base pointer */
   double temp;			/* temporary calculating area */
-  POINT ptr;			/* coordinates of a point to pass to `mov' */
+  /* POINT ptr; */		/* coordinates of a point to pass to `mov' */
 				/* routine                                 */
   int flyback;			/* flag `want to end up at the top of the */
 				/* picture?'                              */
@@ -680,7 +679,7 @@ savestate(void)
  |		place, though.
  *----------------------------------------------------------------------------*/
 
-int
+void
 savebounds(float x,
 	   float y)
 {
diff --git a/src/utils/pfbtops/pfbtops.c b/src/utils/pfbtops/pfbtops.c
index 46b882f5..ece8193a 100644
--- a/src/utils/pfbtops/pfbtops.c
+++ b/src/utils/pfbtops/pfbtops.c
@@ -1,6 +1,7 @@
 /* This translates ps fonts in .pfb format to ASCII ps files. */
 
 #include <stdio.h>
+#include <getopt.h>
 
 /* Binary bytes per output line. */
 #define BYTES_PER_LINE (64/2)