From: hadaq <hadaq>
Date: Sun, 30 Aug 2009 21:10:52 +0000 (+0000)
Subject: solved conflict of trb_strerr with errno.h
X-Git-Tag: v6.0~388
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=542d0812980a4d94d38c1114a09daaa8432c33ef;p=trbnettools.git

solved conflict of trb_strerr with errno.h
---

diff --git a/libtrbnet/trberror.c b/libtrbnet/trberror.c
index 01c04bc..e2b346c 100644
--- a/libtrbnet/trberror.c
+++ b/libtrbnet/trberror.c
@@ -24,7 +24,7 @@ void trb_error(const char *s)
   }
 }
 
-const char* trb_strerror(int errno)
+const char* trb_strerror(int trberrno)
 {
   static const char errorstring[][80] = {
     "No Error",
@@ -54,8 +54,8 @@ const char* trb_strerror(int errno)
     "SEMAPHORE Error"
   };
   
-  if (errno < 25) {
-    return errorstring[errno];
+  if (trberrno < 25) {
+    return errorstring[trberrno];
   } else {
     return "Unknown Errno";
   }
diff --git a/libtrbnet/trberror.h b/libtrbnet/trberror.h
index 2a7eed2..78b3cea 100644
--- a/libtrbnet/trberror.h
+++ b/libtrbnet/trberror.h
@@ -35,7 +35,7 @@ extern int trb_errno;
 
 void trb_error(const char *s);
 
-const char* trb_strerror(int errno);
+const char* trb_strerror(int trberrno);
 
 
 /* last TRBNet-TermPackage */