summaryrefslogtreecommitdiff
path: root/usr/src/lib/watchmalloc/common/malloc.c
diff options
context:
space:
mode:
authorcraigm <none@none>2005-06-20 15:44:58 -0700
committercraigm <none@none>2005-06-20 15:44:58 -0700
commit78b6ed601aa3a251030edda42ce9770e9c21567a (patch)
tree5f3abc0a1530b93c6f97c7d70f9a8cafc23e0962 /usr/src/lib/watchmalloc/common/malloc.c
parent8e56767d5805b843712c67bce2d732cc722f154b (diff)
downloadillumos-gate-78b6ed601aa3a251030edda42ce9770e9c21567a.tar.gz
6274688 gcc and libsys don't get along
6274692 gcc and libtnf don't get along 6274693 gcc and libuuid don't get along 6274700 gcc and watchmalloc don't get along 6274771 gcc and ucbcmd/mkstr don't get along 6274819 gcc and ucbcmd/whoami don't get along
Diffstat (limited to 'usr/src/lib/watchmalloc/common/malloc.c')
-rw-r--r--usr/src/lib/watchmalloc/common/malloc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr/src/lib/watchmalloc/common/malloc.c b/usr/src/lib/watchmalloc/common/malloc.c
index 8ea421b939..ff0a4a8469 100644
--- a/usr/src/lib/watchmalloc/common/malloc.c
+++ b/usr/src/lib/watchmalloc/common/malloc.c
@@ -19,16 +19,16 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright (c) 1996-1997, 2000-2001 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2001 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
*/
/* Copyright (c) 1988 AT&T */
/* All Rights Reserved */
-
-#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.30 */
+#pragma ident "%Z%%M% %I% %E% SMI"
/*
* Memory management: malloc(), realloc(), free(), memalign().
@@ -85,8 +85,8 @@ static void unprotect(TREE *);
* 0xfeedbeef and 0xfeedface are invalid pointer values in all programs.
*/
static uint64_t patterns[2] = {
- 0xdeadbeefdeadbeef, /* pattern in a freed block */
- 0xbaddcafebaddcafe /* pattern in an allocated block */
+ 0xdeadbeefdeadbeefULL, /* pattern in a freed block */
+ 0xbaddcafebaddcafeULL /* pattern in an allocated block */
};
static void