2abc28d1f2
Version 4.2 fixes: 1) Fixed problems with windows that have a compound text title 2) Fixed problems with the cursor font name 3) error.c will now compile under Solaris 2.6 4) Fixed misc. compilation warnings. Some survive in error.c and states.c 5) Fixed warp function when two screens have the same program: warp will now look first on the screen containing the mouse pointer 6) Fixed hot key functions when num lock/shift lock might be pressed 7) Fixed problem with AutoRootMenu startup 8) Fixed problem with VirtualIconic resource
48 lines
1.1 KiB
Plaintext
48 lines
1.1 KiB
Plaintext
--- mem.c.orig Thu Jan 13 22:36:08 1994
|
|
+++ ./mem.c Fri Jul 16 21:49:03 1999
|
|
@@ -18,7 +18,7 @@
|
|
|
|
|
|
#include <sys/types.h>
|
|
-#include <malloc.h>
|
|
+#include <stdlib.h>
|
|
#include <memory.h>
|
|
#include <stdio.h>
|
|
|
|
@@ -139,7 +139,7 @@
|
|
{
|
|
void *p;
|
|
|
|
- if ((p = malloc(sz)) == NULL)
|
|
+ if ((p = (int *)malloc(sz)) == NULL)
|
|
ErrorGeneral(gettext("Memory allocation failure."));
|
|
|
|
#ifdef MEMDEBUG
|
|
@@ -164,7 +164,7 @@
|
|
{
|
|
void *p;
|
|
|
|
- if ((p = malloc(sz)) == NULL)
|
|
+ if ((p = (int *)malloc(sz)) == NULL)
|
|
ErrorGeneral(GetString("Memory allocation failure."));
|
|
|
|
memset((char *) p, 0, (int) sz);
|
|
@@ -191,7 +191,7 @@
|
|
{
|
|
void *p;
|
|
|
|
- if ((p = calloc(num, sz)) == NULL)
|
|
+ if ((p = (int *)calloc(num, sz)) == NULL)
|
|
ErrorGeneral(GetString("Memory array allocation failure."));
|
|
|
|
memset((char *) p, 0, (int) sz * (int) num);
|
|
@@ -210,7 +210,7 @@
|
|
{
|
|
void *t;
|
|
|
|
- if ((t = realloc(p, sz)) == NULL)
|
|
+ if ((t = (int *)realloc(p, sz)) == NULL)
|
|
ErrorGeneral(GetString("Memory array allocation failure."));
|
|
|
|
#ifdef MEMDEBUG
|