Module Name: src Committed By: christos Date: Fri Oct 28 14:00:20 UTC 2011
Modified Files: src/external/bsd/mdocml/dist: tbl_data.c Log Message: rename data() -> parse_data() to appease the powerpc64 toolchain: {standard input}: Assembler messages: {standard input}:105: Error: symbol `.data' is already defined To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/mdocml/dist/tbl_data.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/mdocml/dist/tbl_data.c diff -u src/external/bsd/mdocml/dist/tbl_data.c:1.1.1.2 src/external/bsd/mdocml/dist/tbl_data.c:1.2 --- src/external/bsd/mdocml/dist/tbl_data.c:1.1.1.2 Fri Apr 15 09:45:36 2011 +++ src/external/bsd/mdocml/dist/tbl_data.c Fri Oct 28 10:00:20 2011 @@ -29,13 +29,13 @@ #include "libmandoc.h" #include "libroff.h" -static int data(struct tbl_node *, struct tbl_span *, +static int parse_data(struct tbl_node *, struct tbl_span *, int, const char *, int *); static struct tbl_span *newspan(struct tbl_node *, int, struct tbl_row *); static int -data(struct tbl_node *tbl, struct tbl_span *dp, +parse_data(struct tbl_node *tbl, struct tbl_span *dp, int ln, const char *p, int *pos) { struct tbl_dat *dat; @@ -154,7 +154,7 @@ tbl_cdata(struct tbl_node *tbl, int ln, if (p[pos] == tbl->opts.tab) { tbl->part = TBL_PART_DATA; pos++; - return(data(tbl, tbl->last_span, ln, p, &pos)); + return(parse_data(tbl, tbl->last_span, ln, p, &pos)); } else if ('\0' == p[pos]) { tbl->part = TBL_PART_DATA; return(1); @@ -269,7 +269,7 @@ tbl_data(struct tbl_node *tbl, int ln, c /* This returns 0 when TBL_PART_CDATA is entered. */ while ('\0' != p[pos]) - if ( ! data(tbl, dp, ln, p, &pos)) + if ( ! parse_data(tbl, dp, ln, p, &pos)) return(0); return(1);