From cf99344f0785c358d6534a4ec5558407107d633b Mon Sep 17 00:00:00 2001
From: fche <fche>
Date: Thu, 14 Jul 2005 21:08:14 +0000
Subject: 2005-07-14  Frank Ch. Eigler  <fche@redhat.com>

	* alloc.c (_stp_error): Rename, to avoid name collision with ../io.c.
---
 runtime/user/alloc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime/user/alloc.c')

diff --git a/runtime/user/alloc.c b/runtime/user/alloc.c
index 433a3ab0..c9d36f3f 100644
--- a/runtime/user/alloc.c
+++ b/runtime/user/alloc.c
@@ -21,7 +21,7 @@ void *malloc(size_t size);
 void free(void *ptr);
 
 enum errorcode { ERR_NONE=0, ERR_NO_MEM };
-enum errorcode _stp_error = ERR_NONE;
+enum errorcode _stp_errorcode = ERR_NONE;
 
 /** Allocates memory within a probe.
  * This is used for small allocations from within a running
@@ -35,7 +35,7 @@ void *_stp_alloc(size_t len)
 {
 	void *ptr = malloc(len);
 	if (unlikely(ptr == NULL))
-		_stp_error = ERR_NO_MEM;
+		_stp_errorcode = ERR_NO_MEM;
 	return ptr;
 }
 
@@ -68,7 +68,7 @@ void *_stp_valloc(size_t len)
 	if (likely(ptr))
 		memset(ptr, 0, len);
 	else
-		_stp_error = ERR_NO_MEM;
+		_stp_errorcode = ERR_NO_MEM;
 	return ptr;
 }
 
-- 
cgit