2005-07-14 Frank Ch. Eigler <fche@redhat.com>

	* alloc.c (_stp_error): Rename, to avoid name collision with ../io.c.

2 files changed, 7 insertions, 3 deletions

diff --git a/runtime/user/ChangeLog b/runtime/user/ChangeLog
index 13350a65..9771edaa 100644
--- a/runtime/user/ChangeLog
+++ b/runtime/user/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-14  Frank Ch. Eigler  <fche@redhat.com>
+
+	* alloc.c (_stp_error): Rename, to avoid name collision with ../io.c.
+
 2005-06-22  Martin Hunt  <hunt@redhat.com>
 
 	* runtime.h: Include config.h first then redefine CONFIG_SMP
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;
 }