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