aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/mi
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-06-01 00:52:06 +0200
committerUlrich Sibiller <uli42@gmx.de>2019-06-12 18:35:01 +0200
commita765857aaa450862f6a3dc5de811671fbc82ca61 (patch)
tree1a964cb04a9d635d16a24c22cb847d830e01a954 /nx-X11/programs/Xserver/mi
parentc0754a35755cdd4e25386abc6378e07605845948 (diff)
downloadnx-libs-a765857aaa450862f6a3dc5de811671fbc82ca61.tar.gz
nx-libs-a765857aaa450862f6a3dc5de811671fbc82ca61.tar.bz2
nx-libs-a765857aaa450862f6a3dc5de811671fbc82ca61.zip
Remove the Must_have_memory hack.
We are not using any alloc function that respects that variable, so lets drop it. Backport of this commit: commit 0ce61e21d6d7dcca0090e319bbcdb678570f2c3f Author: Adam Jackson <ajax@redhat.com> Date: Fri Oct 3 16:05:19 2008 -0400 Remove the Must_have_memory hack. Also remove an astonishing amount of misunderstanding of how casts work.
Diffstat (limited to 'nx-X11/programs/Xserver/mi')
-rw-r--r--nx-X11/programs/Xserver/mi/micursor.c12
-rw-r--r--nx-X11/programs/Xserver/mi/migc.c6
2 files changed, 6 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/mi/micursor.c b/nx-X11/programs/Xserver/mi/micursor.c
index e95c43b3d..90b0f2ae9 100644
--- a/nx-X11/programs/Xserver/mi/micursor.c
+++ b/nx-X11/programs/Xserver/mi/micursor.c
@@ -53,8 +53,6 @@ SOFTWARE.
#include "misc.h"
#include "mi.h"
-extern Bool Must_have_memory;
-
void
miRecolorCursor( pScr, pCurs, displayed)
ScreenPtr pScr;
@@ -65,11 +63,9 @@ miRecolorCursor( pScr, pCurs, displayed)
* This is guaranteed to correct any color-dependent state which may have
* been bound up in private state created by RealizeCursor
*/
- (* pScr->UnrealizeCursor)( pScr, pCurs);
- Must_have_memory = TRUE; /* XXX */
- (* pScr->RealizeCursor)( pScr, pCurs);
- Must_have_memory = FALSE; /* XXX */
- if ( displayed)
- (* pScr->DisplayCursor)( pScr, pCurs);
+ pScr->UnrealizeCursor(pScr, pCurs);
+ pScr->RealizeCursor(pScr, pCurs);
+ if (displayed)
+ pScr->DisplayCursor(pScr, pCurs);
}
diff --git a/nx-X11/programs/Xserver/mi/migc.c b/nx-X11/programs/Xserver/mi/migc.c
index 4d67cbf5d..afd5031a4 100644
--- a/nx-X11/programs/Xserver/mi/migc.c
+++ b/nx-X11/programs/Xserver/mi/migc.c
@@ -68,11 +68,9 @@ miCreateGCOps(prototype)
{
GCOpsPtr ret;
- /* XXX */ Must_have_memory = TRUE;
- ret = (GCOpsPtr) malloc(sizeof(GCOps));
- /* XXX */ Must_have_memory = FALSE;
+ ret = malloc(sizeof(GCOps));
if (!ret)
- return 0;
+ return NULL;
*ret = *prototype;
ret->devPrivate.val = 1;
return ret;