From: Adam Dickmeiss Date: Mon, 15 Dec 1997 15:04:18 +0000 (+0000) Subject: Changed name of member errno to errorno since some systems X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=930f1b9b6effd9f1944a74487e835c721550be2f;p=egate.git Changed name of member errno to errorno since some systems defines error as a preprocessor variable. --- diff --git a/include/gip.h b/include/gip.h index 9deb525..b713a25 100644 --- a/include/gip.h +++ b/include/gip.h @@ -45,6 +45,10 @@ * Europagate, 1995 * * $Log: gip.h,v $ + * Revision 1.5 1997/12/15 15:04:18 adam + * Changed name of member errno to errorno since some systems + * defines error as a preprocessor variable. + * * Revision 1.4 1995/05/22 09:03:38 adam * New argument, block, to cs_open. * @@ -65,7 +69,7 @@ typedef struct GIP_info { int wfd; char *name; int ret; - int errno; + int errorno; } *GIP; GIP gip_initialize (const char *name); diff --git a/util/gip.c b/util/gip.c index 806549a..b1a5195 100644 --- a/util/gip.c +++ b/util/gip.c @@ -45,6 +45,10 @@ * Europagate, 1995 * * $Log: gip.c,v $ + * Revision 1.9 1997/12/15 15:04:18 adam + * Changed name of member errno to errorno since some systems + * defines error as a preprocessor variable. + * * Revision 1.8 1995/05/22 09:03:41 adam * New argument, block, to cs_open. * @@ -100,7 +104,7 @@ GIP gip_initialize (const char *name) } strcpy (gip->name, name); gip->ret = mknod (gip->name, S_IFIFO|0666, 0); - gip->errno = errno; + gip->errorno = errno; gip->rfd = gip->wfd = -1; gw_log (GW_LOG_DEBUG, "gip", "Creating %s", gip->name); return gip; @@ -128,7 +132,7 @@ int gip_outfileno (GIP gip) int gip_errno (GIP gip) { - return gip->errno; + return gip->errorno; } int gip_read (GIP gip, char *buf, size_t count) @@ -143,7 +147,7 @@ int gip_read (GIP gip, char *buf, size_t count) break; if (errno != EINTR) { - gip->errno = errno; + gip->errorno = errno; return -1; } } @@ -164,7 +168,7 @@ int gip_write (GIP gip, const char *buf, size_t count) break; if (errno != EINTR) { - gip->errno = errno; + gip->errorno = errno; return -1; } }