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 8344f68b6f7772ed2ab75d3dc2d4fe15fe574ae5..7934a000d35ff06a96b7c373ce7769c5a7048987 100644 (file)
--- a/cde/lib/DtSvc/DtEncap/MemoryMgr.c
+++ b/cde/lib/DtSvc/DtEncap/MemoryMgr.c
@@ -1,3 +1,25 @@
+/*
+ * CDE - Common Desktop Environment
+ *
+ * Copyright (c) 1993-2012, The Open Group. All rights reserved.
+ *
+ * These libraries and programs are free software; you can
+ * redistribute them and/or modify them under the terms of the GNU
+ * Lesser General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * These libraries and programs are distributed in the hope that
+ * they will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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
+ */
 /*
  * File:         MemoryMgr.c $XConsortium: MemoryMgr.c /main/3 1995/10/26 15:34:54 rswiston $
  * Language:     C
@@ -10,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. */
 
@@ -33,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;
     }