groff/gcc4.patch

139 lines
4.2 KiB
Diff

diff -prN groff-1.18.1.1-orig/src/preproc/eqn/box.cc groff-1.18.1.1/src/preproc/eqn/box.cc
*** groff-1.18.1.1-orig/src/preproc/eqn/box.cc Thu Apr 4 16:04:45 2002
--- groff-1.18.1.1/src/preproc/eqn/box.cc Wed Sep 15 23:28:05 2004
*************** int matrix_side_sep = 17; // = thin spac
*** 80,86 ****
int nroff = 0; // should we grok ndefine or tdefine?
! struct {
const char *name;
int *ptr;
} param_table[] = {
--- 80,86 ----
int nroff = 0; // should we grok ndefine or tdefine?
! struct param {
const char *name;
int *ptr;
} param_table[] = {
diff -prN groff-1.18.1.1-orig/src/preproc/grn/hgraph.cc groff-1.18.1.1/src/preproc/grn/hgraph.cc
*** groff-1.18.1.1-orig/src/preproc/grn/hgraph.cc Mon Oct 7 06:49:03 2002
--- groff-1.18.1.1/src/preproc/grn/hgraph.cc Wed Sep 15 23:28:36 2004
*************** extern int ytop;
*** 43,49 ****
extern int ybottom;
extern int xleft;
extern int xright;
! extern enum {
OUTLINE, FILL, BOTH
} polyfill;
--- 43,49 ----
extern int ybottom;
extern int xleft;
extern int xright;
! extern enum filltype {
OUTLINE, FILL, BOTH
} polyfill;
diff -prN groff-1.18.1.1-orig/src/preproc/grn/main.cc groff-1.18.1.1/src/preproc/grn/main.cc
*** groff-1.18.1.1-orig/src/preproc/grn/main.cc Sun Feb 10 02:22:12 2002
--- groff-1.18.1.1/src/preproc/grn/main.cc Wed Sep 15 23:29:04 2004
*************** int style[STYLES] =
*** 160,166 ****
double scale = 1.0; /* no scaling, default */
int defpoint = 0; /* flag for pointsize scaling */
char *defstipple = (char *) 0;
! enum {
OUTLINE, FILL, BOTH
} polyfill;
--- 160,166 ----
double scale = 1.0; /* no scaling, default */
int defpoint = 0; /* flag for pointsize scaling */
char *defstipple = (char *) 0;
! enum filltype {
OUTLINE, FILL, BOTH
} polyfill;
diff -prN groff-1.18.1.1-orig/src/preproc/refer/command.cc groff-1.18.1.1/src/preproc/refer/command.cc
*** groff-1.18.1.1-orig/src/preproc/refer/command.cc Sun Feb 10 02:22:12 2002
--- groff-1.18.1.1/src/preproc/refer/command.cc Wed Sep 15 23:29:34 2004
*************** a single field,
*** 632,638 ****
? means that the previous argument is optional, * means that the
previous argument can occur any number of times. */
! struct {
const char *name;
command_t func;
const char *arg_types;
--- 632,638 ----
? means that the previous argument is optional, * means that the
previous argument can occur any number of times. */
! struct command {
const char *name;
command_t func;
const char *arg_types;
diff -prN groff-1.18.1.1-orig/src/utils/tfmtodit/tfmtodit.cc groff-1.18.1.1/src/utils/tfmtodit/tfmtodit.cc
*** groff-1.18.1.1-orig/src/utils/tfmtodit/tfmtodit.cc Sun Aug 19 23:32:41 2001
--- groff-1.18.1.1/src/utils/tfmtodit/tfmtodit.cc Wed Sep 15 23:30:09 2004
*************** lig_chars table. `ch' gives the full-nam
*** 650,656 ****
gives the groff name of the character, `i' gives its index in
the encoding, which is filled in later (-1 if it does not appear). */
! struct {
const char *ch;
int i;
} lig_chars[] = {
--- 650,656 ----
gives the groff name of the character, `i' gives its index in
the encoding, which is filled in later (-1 if it does not appear). */
! struct lig_char {
const char *ch;
int i;
} lig_chars[] = {
*************** enum { CH_f, CH_i, CH_l, CH_ff, CH_fi, C
*** 670,676 ****
// Each possible ligature appears in this table.
! struct {
unsigned char c1, c2, res;
const char *ch;
} lig_table[] = {
--- 670,676 ----
// Each possible ligature appears in this table.
! struct lig {
unsigned char c1, c2, res;
const char *ch;
} lig_table[] = {
--- groff-1.18.1.1/src/xditview/xtotroff.c.xx 2005-09-17 21:05:23.000000000 +0200
+++ groff-1.18.1.1/src/xditview/xtotroff.c 2005-09-17 21:06:12.000000000 +0200
@@ -11,6 +11,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <fcntl.h>
+#include <string.h>
#include "config.h"
#include "XFontName.h"
#include "DviChar.h"
--- groff-1.18.1.1/src/xditview/DviChar.c.xx 2005-09-17 21:05:37.000000000 +0200
+++ groff-1.18.1.1/src/xditview/DviChar.c 2005-09-17 21:06:03.000000000 +0200
@@ -6,6 +6,7 @@
*/
#include <stdlib.h>
+#include <string.h>
#include "config.h"
#include "DviChar.h"
#include "encoding.h"