[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-cvs
Subject:    svn commit: r10455 - in branches/1.1.x: . subversion/clients/cmdline
From:       maxb () tigris ! org
Date:       2004-07-31 22:33:46
Message-ID: 200407312233.i6VMXk013499 () morbius ! ch ! collab ! net
[Download RAW message or body]

Author: maxb
Date: Sat Jul 31 17:33:45 2004
New Revision: 10455

Modified:
   branches/1.1.x/STATUS
   branches/1.1.x/subversion/clients/cmdline/prompt.c
Log:
Merge r10431 from trunk to 1.1.x branch.

Disable wait_for_input on Windows.
Fix prompting on Windows so it actually works right.

Approved by: +1: breser, sussman, cmpilato


Modified: branches/1.1.x/STATUS
Url: http://svn.collab.net/viewcvs/svn/branches/1.1.x/STATUS?view=diff&rev=10455&p1=branches/1.1.x/STATUS&r1=10454&p2=branches/1.1.x/STATUS&r2=10455
 ==============================================================================
--- branches/1.1.x/STATUS	(original)
+++ branches/1.1.x/STATUS	Sat Jul 31 17:33:45 2004
@@ -28,12 +28,6 @@
     Votes:
       +1 lundblad
 
-  * r10431
-    Disable wait_for_input on Windows.
-    Justification: Fix prompting on Windows so it actually works right.
-    Votes:
-      +1: breser, sussman, cmpilato
-
   * r10440
     Fix pool usage for SVN::Ra in the Perl bindings.
     Justification:

Modified: branches/1.1.x/subversion/clients/cmdline/prompt.c
Url: http://svn.collab.net/viewcvs/svn/branches/1.1.x/subversion/clients/cmdline/promp \
t.c?view=diff&rev=10455&p1=branches/1.1.x/subversion/clients/cmdline/prompt.c&r1=10454&p2=branches/1.1.x/subversion/clients/cmdline/prompt.c&r2=10455
 ==============================================================================
--- branches/1.1.x/subversion/clients/cmdline/prompt.c	(original)
+++ branches/1.1.x/subversion/clients/cmdline/prompt.c	Sat Jul 31 17:33:45 2004
@@ -49,6 +49,15 @@
   apr_pollfd_t pollset;
   int srv, n;
 
+/* APR specs say things that are unimplemented are supposed to return
+ * APR_ENOTIMPL.  But when trying to use APR_POLL_FILE with apr_poll
+ * on Windows it returns APR_EBADF instead.  So just return APR_ENOTIMPL
+ * ourselves here.
+ */
+#ifdef WIN32
+  return APR_ENOTIMPL;
+#endif /* WIN32 */
+  
   pollset.desc_type = APR_POLL_FILE;
   pollset.desc.f = f;
   pollset.p = pool;

---------------------------------------------------------------------
To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
For additional commands, e-mail: svn-help@subversion.tigris.org


[prev in list] [next in list] [prev in thread] [next in thread]