From 88a628163ee00baa8726be5fba04bcc76b5e1841 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Sun, 6 Jul 2003 23:24:13 +0000
Subject: [PATCH] * newsym: Use correct prefix for generating imports. *
pinfo.cc (_pinfo::commune_send): Don't wait forever for a response from
another process.
---
winsup/cygwin/ChangeLog | 6 ++++++
winsup/cygwin/newsym | 2 +-
winsup/cygwin/pinfo.cc | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 13749d0f4..16b75af7e 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-06 Christopher Faylor <cgf@redhat.com>
+
+ * newsym: Use correct prefix for generating imports.
+ * pinfo.cc (_pinfo::commune_send): Don't wait forever for a response
+ from another process.
+
2003-07-06 Christopher Faylor <cgf@redhat.com>
* syscalls.cc (gethostid): Set thread affinity so that results are
diff --git a/winsup/cygwin/newsym b/winsup/cygwin/newsym
index 688a8c6f8..2453afd5f 100755
--- a/winsup/cygwin/newsym
+++ b/winsup/cygwin/newsym
@@ -11,7 +11,7 @@ while [ -n "$1" ]; do
oldsym=$1; shift
cat <<EOF > newsym.dir/$newsym.s
.section .idata$6
- .extern __imp__$oldsym
+ .extern __imp_$oldsym
.extern __head_cygwin1_dll
.section .text
.global _$newsym
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index 625f0224f..8899defb3 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -363,7 +363,7 @@ _pinfo::commune_send (DWORD code)
/* FIXME: Need something better than an busy loop here */
bool isalive;
- while ((isalive = alive ()))
+ for (int i = 0; (isalive = alive ()) || (i < 65536); i++)
if (myself->hello_pid <= 0)
break;
else