summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2005-03-18 22:42:51 +0000
committerChristopher Faylor <me@cgf.cx>2005-03-18 22:42:51 +0000
commitcfaf367058257bdeb2fb93250684335b00f5854f (patch)
tree1821cd3924ce735e3f2b45106d405f2486f6450b
parentbb8dc8c4cb559c2e44b137cf79762ae1eaeca1af (diff)
downloadcygnal-cfaf367058257bdeb2fb93250684335b00f5854f.tar.gz
cygnal-cfaf367058257bdeb2fb93250684335b00f5854f.tar.bz2
cygnal-cfaf367058257bdeb2fb93250684335b00f5854f.zip
* net.cc (cygwin_getprotobyname): Don't try to be fancy with return values.
(cygwin_getprotobynumber): Ditto.
-rw-r--r--winsup/cygwin/ChangeLog6
-rw-r--r--winsup/cygwin/net.cc4
2 files changed, 8 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4768c0461..09a51016f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-18 Christopher Faylor <cgf@timesys.com>
+
+ * net.cc (cygwin_getprotobyname): Don't try to be fancy with return
+ values.
+ (cygwin_getprotobynumber): Ditto.
+
2005-03-17 Corinna Vinschen <corinna@vinschen.de>
* fhandler_disk_file.cc (fhandler_disk_file::utimes): Handle opening
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index 6714cd1fb..46455285d 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -538,14 +538,14 @@ cygwin_getprotobyname (const char *p)
{
if (check_null_str_errno (p))
return NULL;
- __builtin_return (dup_ent (protoent_buf, getprotobyname (p), t_protoent));
+ return (protoent *) dup_ent (protoent_buf, getprotobyname (p), t_protoent);
}
/* exported as getprotobynumber: standards? */
extern "C" struct protoent *
cygwin_getprotobynumber (int number)
{
- __builtin_return (dup_ent (protoent_buf, getprotobynumber (number), t_protoent));
+ return (protoent *) dup_ent (protoent_buf, getprotobynumber (number), t_protoent);
}
bool