From: fredb <fredb>
Date: Sat, 18 Apr 2009 22:20:50 +0000 (+0000)
Subject: errno is a reserved macro in some compilers
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3bb6d99542c412b8143c539f2114fac03666410f;p=flightgear.git

errno is a reserved macro in some compilers
---

diff --git a/utils/xmlgrep/xml.c b/utils/xmlgrep/xml.c
index 7c3386d06..0960ab5f3 100644
--- a/utils/xmlgrep/xml.c
+++ b/utils/xmlgrep/xml.c
@@ -75,7 +75,7 @@ static const char *__xml_error_str[XML_MAX_ERROR];
 struct _xml_error
 {
     char *pos;
-    int errno;
+    int err_no;
 };
 
 static void __xmlErrorSet(const void *, const char *, unsigned int);
@@ -1094,8 +1094,8 @@ xmlErrorGetNo(const void *id)
         {
             struct _xml_error *err = rid->info;
 
-            ret = err->errno;
-            err->errno = 0;
+            ret = err->err_no;
+            err->err_no = 0;
         }
     }
 
@@ -1158,8 +1158,8 @@ xmlErrorGetString(const void *id)
         if (rid->info)
         {
             struct _xml_error *err = rid->info;
-            if (XML_NO_ERROR <= err->errno && err->errno < XML_MAX_ERROR)
-               ret = (char *)__xml_error_str[err->errno];
+            if (XML_NO_ERROR <= err->err_no && err->err_no < XML_MAX_ERROR)
+               ret = (char *)__xml_error_str[err->err_no];
             else
                ret = "incorrect error number.";
         }
@@ -1509,7 +1509,7 @@ __xml_memncasecmp(const char *haystack, size_t *haystacklen,
 
 #ifndef XML_NONVALIDATING
 void
-__xmlErrorSet(const void *id, const char *pos, unsigned int errno)
+__xmlErrorSet(const void *id, const char *pos, unsigned int err_no)
 {
    struct _xml_id *xid = (struct _xml_id *)id;
    struct _root_id *rid;
@@ -1529,7 +1529,7 @@ __xmlErrorSet(const void *id, const char *pos, unsigned int errno)
       struct _xml_error *err = rid->info;
 
       err->pos = (char *)pos;
-      err->errno = errno;
+      err->err_no = err_no;
    }
 }
 #endif