aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-11-03 17:05:28 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-11-03 17:05:28 +0100
commitfbde6d285a2712892ed05f5b9bd9a2987d64d009 (patch)
treeeba5fcef4ba4e25c6e7cd5b0a5df631543bff302
parentced973e36f67f78cef720d0fc54e47bb8e5b22a6 (diff)
downloadnx-libs-fbde6d285a2712892ed05f5b9bd9a2987d64d009.tar.gz
nx-libs-fbde6d285a2712892ed05f5b9bd9a2987d64d009.tar.bz2
nx-libs-fbde6d285a2712892ed05f5b9bd9a2987d64d009.zip
NXdixfonts.c: Rename BREAK_XFONT_LOOP to NXAGENT_DANGEROUS_XFONT_LOOP_EXIT (better macro name).
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
index 516b7eb02..8ec4145f0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
@@ -1199,7 +1199,7 @@ nxdoListFontsAndAliases(ClientPtr client, nxFsPtr fss)
if (err == Successful)
{
-#ifndef BREAK_XFONT_LOOP
+#ifndef NXAGENT_DANGEROUS_XFONT_LOOP_EXIT
if (tmp[0] != 0)
{
continue;
@@ -1214,7 +1214,7 @@ nxdoListFontsAndAliases(ClientPtr client, nxFsPtr fss)
tmp[c->savedNameLen >255 ? 255 : c->savedNameLen] = 0;
if (nxagentFontLookUp(tmp))
{
-#ifdef BREAK_XFONT_LOOP
+#ifdef NXAGENT_DANGEROUS_XFONT_LOOP_EXIT
break;
#else
continue;
@@ -1229,7 +1229,7 @@ nxdoListFontsAndAliases(ClientPtr client, nxFsPtr fss)
tmp[namelen > 255 ? 255 : namelen] = 0;
if (nxagentFontLookUp(tmp))
{
-#ifdef BREAK_XFONT_LOOP
+#ifdef NXAGENT_DANGEROUS_XFONT_LOOP_EXIT
break;
#else
continue;
@@ -1327,7 +1327,7 @@ nxdoListFontsAndAliases(ClientPtr client, nxFsPtr fss)
bail:
finish:
-#ifdef BREAK_XFONT_LOOP
+#ifdef NXAGENT_DANGEROUS_XFONT_LOOP_EXIT
/* if we allow above loop to be exited via break
we need to free the private xfont data somehow. */
if (c->current.list_started)