Convert uses of XKeycodeToKeysym (deprecated) to XkbKeycodeToKeysym

[oweals/cde.git] / cde / lib / DtSvc / DtEncap / MemoryMgr.c

diff --git a/cde/lib/DtSvc/DtEncap/MemoryMgr.c b/cde/lib/DtSvc/DtEncap/MemoryMgr.c
index 668854d8f75dd28b06f6553ec47058903619b078..7934a000d35ff06a96b7c373ce7769c5a7048987 100644 (file)
--- a/cde/lib/DtSvc/DtEncap/MemoryMgr.c
+++ b/cde/lib/DtSvc/DtEncap/MemoryMgr.c
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -32,9 +32,7 @@
  * (c) Copyright 1993, 1994 Novell, Inc.                               *
  */
 
-#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
-#include "/usr/include/apollo/shlib.h"
-#endif
+#include <Dt/UserMsg.h>
 
 #include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */
 
@@ -55,8 +53,8 @@ void * XeMalloc( size_t size )
     XeString  ptr;
     
     if (!size) return 0;
-    if (ptr = malloc(size)) {
-       *ptr = (XeChar)NULL;   /* Force first byte to NULL for bozos who */
+    if ((ptr = malloc(size))) {
+       *ptr = (XeChar)0;   /* Force first byte to NULL for bozos who */
                               /* think malloc zeros memory!             */
        return ptr;
     }