aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarved <arved@FreeBSD.org>2002-11-29 03:26:16 +0800
committerarved <arved@FreeBSD.org>2002-11-29 03:26:16 +0800
commit6804b6bc6391feddccb533ff53e937a460c837ba (patch)
tree719010d85cd81a74cbae816362bcc4d46b5142ef
parent1f578350766e1ec68b0397df0dd3595d26235ece (diff)
downloadfreebsd-ports-gnome-6804b6bc6391feddccb533ff53e937a460c837ba.tar.gz
freebsd-ports-gnome-6804b6bc6391feddccb533ff53e937a460c837ba.tar.zst
freebsd-ports-gnome-6804b6bc6391feddccb533ff53e937a460c837ba.zip
Fix build on -CURRENT
PR: 43720 Submitted by: Craig Rodrigues <rodrigc@attbi.com>
-rw-r--r--devel/re2c/files/patch-scanner.h15
-rw-r--r--devel/re2c/files/patch-scanner.re94
2 files changed, 109 insertions, 0 deletions
diff --git a/devel/re2c/files/patch-scanner.h b/devel/re2c/files/patch-scanner.h
new file mode 100644
index 000000000000..a2a6dc2f5c33
--- /dev/null
+++ b/devel/re2c/files/patch-scanner.h
@@ -0,0 +1,15 @@
+--- ./scanner.h.orig Thu Aug 26 23:46:32 1999
++++ ./scanner.h Sat Oct 5 13:27:00 2002
+@@ -6,10 +6,10 @@
+ class Scanner {
+ private:
+ int in;
+- uchar *bot, *tok, *ptr, *cur, *pos, *lim, *top, *eof;
++ char *bot, *tok, *ptr, *cur, *pos, *lim, *top, *eof;
+ uint tchar, tline, cline;
+ private:
+- uchar *fill(uchar*);
++ char *fill(char*);
+ public:
+ Scanner(int);
+ int echo(ostream&);
diff --git a/devel/re2c/files/patch-scanner.re b/devel/re2c/files/patch-scanner.re
new file mode 100644
index 000000000000..368207c1286f
--- /dev/null
+++ b/devel/re2c/files/patch-scanner.re
@@ -0,0 +1,94 @@
+--- ./scanner.re.orig Thu Aug 26 23:46:32 1999
++++ ./scanner.re Sat Oct 5 13:27:00 2002
+@@ -10,7 +10,7 @@
+
+ #define BSIZE 8192
+
+-#define YYCTYPE uchar
++#define YYCTYPE char
+ #define YYCURSOR cursor
+ #define YYLIMIT lim
+ #define YYMARKER ptr
+@@ -25,7 +25,7 @@
+ ;
+ }
+
+-uchar *Scanner::fill(uchar *cursor){
++char *Scanner::fill(char *cursor){
+ if(!eof){
+ uint cnt = tok - bot;
+ if(cnt){
+@@ -37,7 +37,7 @@
+ lim -= cnt;
+ }
+ if((top - lim) < BSIZE){
+- uchar *buf = new uchar[(lim - bot) + BSIZE];
++ char *buf = new char[(lim - bot) + BSIZE];
+ memcpy(buf, tok, lim - tok);
+ tok = buf;
+ ptr = &buf[ptr - bot];
+@@ -68,7 +68,7 @@
+ */
+
+ int Scanner::echo(ostream &out){
+- uchar *cursor = cur;
++ char *cursor = cur;
+ tok = cursor;
+ echo:
+ /*!re2c
+@@ -85,7 +85,7 @@
+
+
+ int Scanner::scan(){
+- uchar *cursor = cur;
++ char *cursor = cur;
+ uint depth;
+
+ scan:
+--- ./scanner.cc.orig Thu Aug 26 23:46:32 1999
++++ ./scanner.cc Sat Oct 5 13:27:00 2002
+@@ -12,7 +12,7 @@
+
+ #define BSIZE 8192
+
+-#define YYCTYPE uchar
++#define YYCTYPE char
+ #define YYCURSOR cursor
+ #define YYLIMIT lim
+ #define YYMARKER ptr
+@@ -27,7 +27,7 @@
+ ;
+ }
+
+-uchar *Scanner::fill(uchar *cursor){
++char *Scanner::fill(char *cursor){
+ if(!eof){
+ uint cnt = tok - bot;
+ if(cnt){
+@@ -39,7 +39,7 @@
+ lim -= cnt;
+ }
+ if((top - lim) < BSIZE){
+- uchar *buf = new uchar[(lim - bot) + BSIZE];
++ char *buf = new char[(lim - bot) + BSIZE];
+ memcpy(buf, tok, lim - tok);
+ tok = buf;
+ ptr = &buf[ptr - bot];
+@@ -62,7 +62,7 @@
+
+
+ int Scanner::echo(ostream &out){
+- uchar *cursor = cur;
++ char *cursor = cur;
+ tok = cursor;
+ echo:
+ {
+@@ -117,7 +117,7 @@
+
+
+ int Scanner::scan(){
+- uchar *cursor = cur;
++ char *cursor = cur;
+ uint depth;
+
+ scan: