Upstream-status: Not presented upstream.

--- doc++-3.4.10/src/doc2dbxml.ll.orig	2025-01-02 19:35:28.284584323 +0100
+++ doc++-3.4.10/src/doc2dbxml.ll	2025-01-02 19:36:30.316732013 +0100
@@ -57,8 +57,8 @@
 static int	skip          = 0;
 static int	tab           = 0;
 static int	yyLineNr      = 0;
-static Entry*	ref           = 0;
-static Entry*	noref         = ref + 1;
+static Entry*	g_ref    = 0;
+static Entry*	noref         = g_ref + 1;
 static char	yyFileName[264];
 static bool		mathmode      = false;
 static int	tabFlag	      = 0;
@@ -147,28 +147,28 @@
 			}
 
 <Ref>[^}]*		{
-			if(ref == 0)
+			if(g_ref == 0)
 			    {
 			    McString tmp = yytext;
-			    ref = getRefEntry(tmp, current);
+			    g_ref = getRefEntry(tmp, current);
 			    }
 			REJECT;
 			}
 
 <Ref>"}"		{
-			if(ref && ref != noref)
+			if(g_ref && g_ref != noref)
 			    {
 			    fprintf(out, " ($\\rightarrow$ ");
-			    if(MAKE_DOC(ref))
+			    if(MAKE_DOC(g_ref))
 				{
-				ref->dumpNumber(out);
+				g_ref->dumpNumber(out);
 				fprintf(out, ",");
 				}
 			    fprintf(out, " {\\em page }\\pageref{cxx.");
-			    ref->dumpNumber(out);
+			    g_ref->dumpNumber(out);
 			    fprintf(out, "})");
 			    }
-			ref = 0;
+			g_ref = 0;
 			BEGIN(0);
 			}
 
--- doc++-3.4.10/src/doc2dbsgml.ll.orig	2025-01-02 19:39:08.061103757 +0100
+++ doc++-3.4.10/src/doc2dbsgml.ll	2025-01-02 19:39:52.201206812 +0100
@@ -54,8 +54,8 @@
 static int	skip          = 0;
 static int	tab           = 0;
 static int	yyLineNr      = 0;
-static Entry*	ref           = 0;
-static Entry*	noref         = ref + 1;
+static Entry*	g_ref           = 0;
+static Entry*	noref         = g_ref + 1;
 static char	yyFileName[264];
 static bool		mathmode      = false;
 static int	tabFlag	      = 0;
@@ -144,28 +144,28 @@
 			}
 
 <Ref>[^}]*		{
-			if(ref == 0)
+			if(g_ref == 0)
 			    {
 			    McString tmp = yytext;
-			    ref = getRefEntry(tmp, current);
+			    g_ref = getRefEntry(tmp, current);
 			    }
 			REJECT;
 			}
 
 <Ref>"}"		{
-			if(ref && ref != noref)
+			if(g_ref && g_ref != noref)
 			    {
 			    fprintf(out, " ($\\rightarrow$ ");
-			    if(MAKE_DOC(ref))
+			    if(MAKE_DOC(g_ref))
 				{
-				ref->dumpNumber(out);
+				g_ref->dumpNumber(out);
 				fprintf(out, ",");
 				}
 			    fprintf(out, " {\\em page }\\pageref{cxx.");
-			    ref->dumpNumber(out);
+			    g_ref->dumpNumber(out);
 			    fprintf(out, "})");
 			    }
-			ref = 0;
+			g_ref = 0;
 			BEGIN(0);
 			}
 
--- doc++-3.4.10/src/doc2tex.ll.orig	2025-01-02 19:40:11.785252404 +0100
+++ doc++-3.4.10/src/doc2tex.ll	2025-01-02 19:40:39.181316047 +0100
@@ -59,8 +59,8 @@
 static int	yyLineNr	= 0;
 static int	texBracketCount	= 0;
 static McString	refStr		= "";
-static Entry*	ref		= 0;
-static Entry*	noref		= ref + 1;
+static Entry*	g_ref		= 0;
+static Entry*	noref		= g_ref + 1;
 static char	yyFileName[264];
 bool		mathmode	= false;
 static int	tabFlag		= 0;
@@ -186,30 +186,30 @@
 			}
 
 <Ref>[^}]*		{
-			if(ref == 0)
+			if(g_ref == 0)
 			    {
 			    refStr = McString(yytext, 0, yyleng - 2);
-			    ref = getRefEntry(refStr, current);
+			    g_ref = getRefEntry(refStr, current);
 			    }
 			REJECT;
 			}
 
 <Ref>"}"		{
-			if(ref && ref != noref)
+			if(g_ref && g_ref != noref)
 			    {
 			    fprintf(out, " ($\\rightarrow$ ");
-			    if(MAKE_DOC(ref))
+			    if(MAKE_DOC(g_ref))
 				{
-				ref->dumpNumber(out);
+				g_ref->dumpNumber(out);
 				fprintf(out, ",");
 				}
 			    fprintf(out, " {\\em page }\\pageref{cxx.");
-			    ref->dumpNumber(out);
+			    g_ref->dumpNumber(out);
 			    fprintf(out, "})");
 			    }
 			else
 			    fprintf(out, refStr.c_str());
-			ref = 0;
+			g_ref = 0;
 			refStr.clear();
 			BEGIN(0);
 			}
@@ -246,28 +246,28 @@
 			}
 
 <Link>[^ ]*		{
-			if(ref == 0)
+			if(g_ref == 0)
 			    {
 			    McString tmp = yytext;
-			    ref = getRefEntry(tmp, current);
+			    g_ref = getRefEntry(tmp, current);
 			    }
 			REJECT;
 			}
 
 <Link>"}"		{
-			if(ref && ref != noref)
+			if(g_ref && g_ref != noref)
 			    {
 			    fprintf(out, " ($\\rightarrow$ ");
-			    if(MAKE_DOC(ref))
+			    if(MAKE_DOC(g_ref))
 				{
-				ref->dumpNumber(out);
+				g_ref->dumpNumber(out);
 				fprintf(out, ",");
 				}
 			    fprintf(out, " {\\em page }\\pageref{cxx.");
-			    ref->dumpNumber(out);
+			    g_ref->dumpNumber(out);
 			    fprintf(out, "})");
 			    }
-			ref = 0;
+			g_ref = 0;
 			BEGIN(0);
 			}